aboutsummaryrefslogtreecommitdiffstats
path: root/fs/jffs2
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2008-08-27 09:48:32 -0400
committerDavid Woodhouse <David.Woodhouse@intel.com>2008-09-01 06:32:59 -0400
commit3fc678a0e63138f56109ea31850f19b2e29c45b8 (patch)
tree50a4f6d81460da59cbe22b705370e2d3a579a63c /fs/jffs2
parent9d7548d4ca3c52ecb58f098a32b0756cdf8f96ee (diff)
CRED: Wrap task credential accesses in the JFFS2 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> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'fs/jffs2')
-rw-r--r--fs/jffs2/fs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/jffs2/fs.c b/fs/jffs2/fs.c
index 89e9b735d8df..249305d65d5b 100644
--- a/fs/jffs2/fs.c
+++ b/fs/jffs2/fs.c
@@ -442,14 +442,14 @@ struct inode *jffs2_new_inode (struct inode *dir_i, int mode, struct jffs2_raw_i
442 442
443 memset(ri, 0, sizeof(*ri)); 443 memset(ri, 0, sizeof(*ri));
444 /* Set OS-specific defaults for new inodes */ 444 /* Set OS-specific defaults for new inodes */
445 ri->uid = cpu_to_je16(current->fsuid); 445 ri->uid = cpu_to_je16(current_fsuid());
446 446
447 if (dir_i->i_mode & S_ISGID) { 447 if (dir_i->i_mode & S_ISGID) {
448 ri->gid = cpu_to_je16(dir_i->i_gid); 448 ri->gid = cpu_to_je16(dir_i->i_gid);
449 if (S_ISDIR(mode)) 449 if (S_ISDIR(mode))
450 mode |= S_ISGID; 450 mode |= S_ISGID;
451 } else { 451 } else {
452 ri->gid = cpu_to_je16(current->fsgid); 452 ri->gid = cpu_to_je16(current_fsgid());
453 } 453 }
454 454
455 /* POSIX ACLs have to be processed now, at least partly. 455 /* POSIX ACLs have to be processed now, at least partly.