summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2008-12-08 09:36:40 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2008-12-08 09:36:40 +1100
commit6803a4f72c7eea6f8d0e27007ccd70373ddd3da3 (patch)
tree25f4a9aca975daf964e14988e82a05e2c144e842 /fs
parenta153179473c3d65f3e755c197684838e7c8c3cb4 (diff)
tty-wrap-credentials
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> Signed-off-by: Alan Cox <alan@redhat.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/devpts/inode.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c
index b956f1675d52..fff96e152c0c 100644
--- a/fs/devpts/inode.c
+++ b/fs/devpts/inode.c
@@ -594,9 +594,9 @@ int devpts_pty_new(struct inode *ptmx_inode, struct tty_struct *tty)
if (!inode)
return -ENOMEM;
- inode->i_ino = number+3;
- inode->i_uid = opts->setuid ? opts->uid : current->fsuid;
- inode->i_gid = opts->setgid ? opts->gid : current->fsgid;
+ inode->i_ino = number + 3;
+ inode->i_uid = opts->setuid ? opts->uid : current_fsuid();
+ inode->i_gid = opts->setgid ? opts->gid : current_fsgid();
inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
init_special_inode(inode, S_IFCHR|opts->mode, device);
inode->i_private = tty;