Merge branch 'master' into next

[linux-2.6-omap-h63xx.git] / fs / affs / super.c

diff --git a/fs/affs/super.c b/fs/affs/super.c
index 8989c93193ed227e84c786e629f1fd4f1e81ce4c..a19d64b582aac0e2882610b3a5839d88e0bd329d 100644 (file)
--- a/fs/affs/super.c
+++ b/fs/affs/super.c
@@ -163,8 +163,8 @@ parse_options(char *options, uid_t *uid, gid_t *gid, int *mode, int *reserved, s
 
        /* Fill in defaults */
 
-       *uid        = current->uid;
-       *gid        = current->gid;
+       *uid        = current_uid();
+       *gid        = current_gid();
        *reserved   = 2;
        *root       = -1;
        *blocksize  = -1;