Merge branch 'master' into next

[linux-2.6-omap-h63xx.git] / fs / devpts / inode.c

diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c
index a70d5d0890c7311ba0a0b555f6c977b38eddaa4c..5d61b7c06e134d3321d483793ac3973ce804de32 100644 (file)
--- a/fs/devpts/inode.c
+++ b/fs/devpts/inode.c
@@ -49,7 +49,7 @@ enum {
        Opt_err
 };
 
-static match_table_t tokens = {
+static const match_table_t tokens = {
        {Opt_uid, "uid=%u"},
        {Opt_gid, "gid=%u"},
        {Opt_mode, "mode=%o"},
@@ -222,8 +222,8 @@ int devpts_pty_new(struct inode *ptmx_inode, struct tty_struct *tty)
                return -ENOMEM;
 
        inode->i_ino = number+2;
-       inode->i_uid = config.setuid ? config.uid : current->fsuid;
-       inode->i_gid = config.setgid ? config.gid : current->fsgid;
+       inode->i_uid = config.setuid ? config.uid : current_fsuid();
+       inode->i_gid = config.setgid ? config.gid : current_fsgid();
        inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
        init_special_inode(inode, S_IFCHR|config.mode, device);
        inode->i_private = tty;