diff options
| author | James Morris <jmorris@namei.org> | 2008-12-24 19:40:09 -0500 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-12-24 19:40:09 -0500 |
| commit | cbacc2c7f066a1e01b33b0e27ae5efbf534bc2db (patch) | |
| tree | 90d1093131d2a3543a8b3b1f3364e7c6f4081a93 /fs/affs/super.c | |
| parent | 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 (diff) | |
| parent | 74192246910ff4fb95309ba1a683215644beeb62 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'fs/affs/super.c')
| -rw-r--r-- | fs/affs/super.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/affs/super.c b/fs/affs/super.c index 8989c93193ed..a19d64b582aa 100644 --- 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 | |||
| 163 | 163 | ||
| 164 | /* Fill in defaults */ | 164 | /* Fill in defaults */ |
| 165 | 165 | ||
| 166 | *uid = current->uid; | 166 | *uid = current_uid(); |
| 167 | *gid = current->gid; | 167 | *gid = current_gid(); |
| 168 | *reserved = 2; | 168 | *reserved = 2; |
| 169 | *root = -1; | 169 | *root = -1; |
| 170 | *blocksize = -1; | 170 | *blocksize = -1; |