diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-10-20 19:17:22 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-10-20 19:17:22 +1100 |
| commit | c72181026d0989608a43a9a7eda4a8044cf34c18 (patch) | |
| tree | 1cead9d83222e9f401bac884aa751c9fc1b02d82 /fs/devpts | |
| parent | c4052e69f851e1ca5d787b7e15a51eaf8176e5eb (diff) | |
| parent | b84a6734984c2d19db6326513f94ec4a792a443d (diff) | |
Merge commit 'creds/next-creds-subsys'
Conflicts:
fs/devpts/inode.c
fs/namespace.c
fs/nfsd/nfs4recover.c
include/linux/sched.h
kernel/exit.c
kernel/fork.c
kernel/signal.c
net/9p/client.c
security/selinux/hooks.c
Diffstat (limited to 'fs/devpts')
| -rw-r--r-- | fs/devpts/inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c index 500648544033..df843fa8ce38 100644 --- a/fs/devpts/inode.c +++ b/fs/devpts/inode.c @@ -595,8 +595,8 @@ int devpts_pty_new(struct inode *ptmx_inode, struct tty_struct *tty) 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_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; |