diff options
author | David Howells <dhowells@redhat.com> | 2008-11-13 18:38:51 -0500 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2008-11-13 18:38:51 -0500 |
commit | 4c9c544e4987efe6643ad5692af47a0abfd4e0d1 (patch) | |
tree | 3414afce05e2757f4a21e483d15833c5679df7a2 | |
parent | 6a2f90e9fae0824e8b6b123f1ea7d9fff9079ef3 (diff) |
CRED: Wrap task credential accesses in the Ext4 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>
Cc: Stephen Tweedie <sct@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: adilger@sun.com
Cc: linux-ext4@vger.kernel.org
Signed-off-by: James Morris <jmorris@namei.org>
-rw-r--r-- | fs/ext4/balloc.c | 2 | ||||
-rw-r--r-- | fs/ext4/ialloc.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c index d2003cdc36aa..a932b9a29240 100644 --- a/fs/ext4/balloc.c +++ b/fs/ext4/balloc.c | |||
@@ -624,7 +624,7 @@ int ext4_has_free_blocks(struct ext4_sb_info *sbi, s64 nblocks) | |||
624 | return 1; | 624 | return 1; |
625 | 625 | ||
626 | /* Hm, nope. Are (enough) root reserved blocks available? */ | 626 | /* Hm, nope. Are (enough) root reserved blocks available? */ |
627 | if (sbi->s_resuid == current->fsuid || | 627 | if (sbi->s_resuid == current_fsuid() || |
628 | ((sbi->s_resgid != 0) && in_group_p(sbi->s_resgid)) || | 628 | ((sbi->s_resgid != 0) && in_group_p(sbi->s_resgid)) || |
629 | capable(CAP_SYS_RESOURCE)) { | 629 | capable(CAP_SYS_RESOURCE)) { |
630 | if (free_blocks >= (nblocks + dirty_blocks)) | 630 | if (free_blocks >= (nblocks + dirty_blocks)) |
diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c index fe34d74cfb19..c8ea50ed023a 100644 --- a/fs/ext4/ialloc.c +++ b/fs/ext4/ialloc.c | |||
@@ -785,7 +785,7 @@ got: | |||
785 | spin_unlock(sb_bgl_lock(sbi, flex_group)); | 785 | spin_unlock(sb_bgl_lock(sbi, flex_group)); |
786 | } | 786 | } |
787 | 787 | ||
788 | inode->i_uid = current->fsuid; | 788 | inode->i_uid = current_fsuid(); |
789 | if (test_opt(sb, GRPID)) | 789 | if (test_opt(sb, GRPID)) |
790 | inode->i_gid = dir->i_gid; | 790 | inode->i_gid = dir->i_gid; |
791 | else if (dir->i_mode & S_ISGID) { | 791 | else if (dir->i_mode & S_ISGID) { |
@@ -793,7 +793,7 @@ got: | |||
793 | if (S_ISDIR(mode)) | 793 | if (S_ISDIR(mode)) |
794 | mode |= S_ISGID; | 794 | mode |= S_ISGID; |
795 | } else | 795 | } else |
796 | inode->i_gid = current->fsgid; | 796 | inode->i_gid = current_fsgid(); |
797 | inode->i_mode = mode; | 797 | inode->i_mode = mode; |
798 | 798 | ||
799 | inode->i_ino = ino + group * EXT4_INODES_PER_GROUP(sb); | 799 | inode->i_ino = ino + group * EXT4_INODES_PER_GROUP(sb); |