diff options
author | David Howells <dhowells@redhat.com> | 2008-11-13 18:38:52 -0500 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2008-11-13 18:38:52 -0500 |
commit | f0ce7ee3a8ec1e80b6f460983ef1f26e603026f5 (patch) | |
tree | b33766f04f73ed365ec39bb75aabea1b09808d98 /fs/fat | |
parent | 4c9c544e4987efe6643ad5692af47a0abfd4e0d1 (diff) |
CRED: Wrap task credential accesses in the FAT filesystem
Wrap access to task credentials so that they can be separated more easily from
the task_struct during the introduction of COW creds.
Change most current->(|e|s|fs)[ug]id to current_(|e|s|fs)[ug]id().
Change some task->e?[ug]id to task_e?[ug]id(). In some places it makes more
sense to use RCU directly rather than a convenient wrapper; these will be
addressed by later patches.
Signed-off-by: David Howells <dhowells@redhat.com>
Reviewed-by: James Morris <jmorris@namei.org>
Acked-by: Serge Hallyn <serue@us.ibm.com>
Acked-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'fs/fat')
-rw-r--r-- | fs/fat/file.c | 2 | ||||
-rw-r--r-- | fs/fat/inode.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/fat/file.c b/fs/fat/file.c index ddde37025ca6..81e203288340 100644 --- a/fs/fat/file.c +++ b/fs/fat/file.c | |||
@@ -302,7 +302,7 @@ static int fat_allow_set_time(struct msdos_sb_info *sbi, struct inode *inode) | |||
302 | { | 302 | { |
303 | mode_t allow_utime = sbi->options.allow_utime; | 303 | mode_t allow_utime = sbi->options.allow_utime; |
304 | 304 | ||
305 | if (current->fsuid != inode->i_uid) { | 305 | if (current_fsuid() != inode->i_uid) { |
306 | if (in_group_p(inode->i_gid)) | 306 | if (in_group_p(inode->i_gid)) |
307 | allow_utime >>= 3; | 307 | allow_utime >>= 3; |
308 | if (allow_utime & MAY_WRITE) | 308 | if (allow_utime & MAY_WRITE) |
diff --git a/fs/fat/inode.c b/fs/fat/inode.c index 2b2eec1283bf..cf621acd9e9a 100644 --- a/fs/fat/inode.c +++ b/fs/fat/inode.c | |||
@@ -921,8 +921,8 @@ static int parse_options(char *options, int is_vfat, int silent, int *debug, | |||
921 | 921 | ||
922 | opts->isvfat = is_vfat; | 922 | opts->isvfat = is_vfat; |
923 | 923 | ||
924 | opts->fs_uid = current->uid; | 924 | opts->fs_uid = current_uid(); |
925 | opts->fs_gid = current->gid; | 925 | opts->fs_gid = current_gid(); |
926 | opts->fs_fmask = opts->fs_dmask = current->fs->umask; | 926 | opts->fs_fmask = opts->fs_dmask = current->fs->umask; |
927 | opts->allow_utime = -1; | 927 | opts->allow_utime = -1; |
928 | opts->codepage = fat_default_codepage; | 928 | opts->codepage = fat_default_codepage; |