Commit 94c9a5ee4cc7fb7eee2a9f9e47f7ccea6b1869ff
Committed by
James Morris
1 parent
3de7be3355
Exists in
master
and in
39 other branches
CRED: Wrap task credential accesses in the HFS 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: Roman Zippel <zippel@linux-m68k.org> Signed-off-by: James Morris <jmorris@namei.org>
Showing 2 changed files with 4 additions and 4 deletions Side-by-side Diff
fs/hfs/inode.c
... | ... | @@ -155,8 +155,8 @@ |
155 | 155 | hfs_cat_build_key(sb, (btree_key *)&HFS_I(inode)->cat_key, dir->i_ino, name); |
156 | 156 | inode->i_ino = HFS_SB(sb)->next_id++; |
157 | 157 | inode->i_mode = mode; |
158 | - inode->i_uid = current->fsuid; | |
159 | - inode->i_gid = current->fsgid; | |
158 | + inode->i_uid = current_fsuid(); | |
159 | + inode->i_gid = current_fsgid(); | |
160 | 160 | inode->i_nlink = 1; |
161 | 161 | inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME_SEC; |
162 | 162 | HFS_I(inode)->flags = 0; |
fs/hfs/super.c
... | ... | @@ -210,8 +210,8 @@ |
210 | 210 | int tmp, token; |
211 | 211 | |
212 | 212 | /* initialize the sb with defaults */ |
213 | - hsb->s_uid = current->uid; | |
214 | - hsb->s_gid = current->gid; | |
213 | + hsb->s_uid = current_uid(); | |
214 | + hsb->s_gid = current_gid(); | |
215 | 215 | hsb->s_file_umask = 0133; |
216 | 216 | hsb->s_dir_umask = 0022; |
217 | 217 | hsb->s_type = hsb->s_creator = cpu_to_be32(0x3f3f3f3f); /* == '????' */ |