Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

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

diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c
index 0273f0c..5fa3655 100644 (file)
--- a/fs/devpts/inode.c
+++ b/fs/devpts/inode.c
@@ -18,16 +18,8 @@
 #include <linux/mount.h>
 #include <linux/tty.h>
 #include <linux/devpts_fs.h>
-#include <linux/xattr.h>
+#include <linux/parser.h>
 
-extern struct xattr_handler devpts_xattr_security_handler;
-
-static struct xattr_handler *devpts_xattr_handlers[] = {
-#ifdef CONFIG_DEVPTS_FS_SECURITY
-       &devpts_xattr_security_handler,
-#endif
-       NULL
-};
 
 static int devpts_permission(struct inode *inode, int mask, struct nameidata *nd)
 {
@@ -39,13 +31,7 @@ static int devpts_permission(struct inode *inode, int mask, struct nameidata *nd
 }
 
 static struct inode_operations devpts_file_inode_operations = {
-#ifdef CONFIG_DEVPTS_FS_XATTR
-       .setxattr       = generic_setxattr,
-       .getxattr       = generic_getxattr,
-       .listxattr      = generic_listxattr,
-       .removexattr    = generic_removexattr,
-#endif
-       .permission     = devpts_permission,
+       .permission     = devpts_permission,
 };
 
 static struct vfsmount *devpts_mnt;
@@ -59,39 +45,60 @@ static struct {
        umode_t mode;
 } config = {.mode = 0600};
 
+enum {
+       Opt_uid, Opt_gid, Opt_mode,
+       Opt_err
+};
+
+static match_table_t tokens = {
+       {Opt_uid, "uid=%u"},
+       {Opt_gid, "gid=%u"},
+       {Opt_mode, "mode=%o"},
+       {Opt_err, NULL}
+};
+
 static int devpts_remount(struct super_block *sb, int *flags, char *data)
 {
-       int setuid = 0;
-       int setgid = 0;
-       uid_t uid = 0;
-       gid_t gid = 0;
-       umode_t mode = 0600;
-       char *this_char;
-
-       this_char = NULL;
-       while ((this_char = strsep(&data, ",")) != NULL) {
-               int n;
-               char dummy;
-               if (!*this_char)
+       char *p;
+
+       config.setuid  = 0;
+       config.setgid  = 0;
+       config.uid     = 0;
+       config.gid     = 0;
+       config.mode    = 0600;
+
+       while ((p = strsep(&data, ",")) != NULL) {
+               substring_t args[MAX_OPT_ARGS];
+               int token;
+               int option;
+
+               if (!*p)
                        continue;
-               if (sscanf(this_char, "uid=%i%c", &n, &dummy) == 1) {
-                       setuid = 1;
-                       uid = n;
-               } else if (sscanf(this_char, "gid=%i%c", &n, &dummy) == 1) {
-                       setgid = 1;
-                       gid = n;
-               } else if (sscanf(this_char, "mode=%o%c", &n, &dummy) == 1)
-                       mode = n & ~S_IFMT;
-               else {
-                       printk("devpts: called with bogus options\n");
+
+               token = match_token(p, tokens, args);
+               switch (token) {
+               case Opt_uid:
+                       if (match_int(&args[0], &option))
+                               return -EINVAL;
+                       config.uid = option;
+                       config.setuid = 1;
+                       break;
+               case Opt_gid:
+                       if (match_int(&args[0], &option))
+                               return -EINVAL;
+                       config.gid = option;
+                       config.setgid = 1;
+                       break;
+               case Opt_mode:
+                       if (match_octal(&args[0], &option))
+                               return -EINVAL;
+                       config.mode = option & ~S_IFMT;
+                       break;
+               default:
+                       printk(KERN_ERR "devpts: called with bogus options\n");
                        return -EINVAL;
                }
        }
-       config.setuid  = setuid;
-       config.setgid  = setgid;
-       config.uid     = uid;
-       config.gid     = gid;
-       config.mode    = mode;
 
        return 0;
 }
@@ -128,7 +135,6 @@ devpts_fill_super(struct super_block *s, void *data, int silent)
        s->s_blocksize_bits = 10;
        s->s_magic = DEVPTS_SUPER_MAGIC;
        s->s_op = &devpts_sops;
-       s->s_xattr = devpts_xattr_handlers;
        s->s_time_gran = 1;
 
        inode = new_inode(s);
@@ -177,7 +183,7 @@ static struct dentry *get_node(int num)
 {
        char s[12];
        struct dentry *root = devpts_root;
-       down(&root->d_inode->i_sem);
+       mutex_lock(&root->d_inode->i_mutex);
        return lookup_one_len(s, root, sprintf(s, "%d", num));
 }
 
@@ -210,7 +216,7 @@ int devpts_pty_new(struct tty_struct *tty)
        if (!IS_ERR(dentry) && !dentry->d_inode)
                d_instantiate(dentry, inode);
 
-       up(&devpts_root->d_inode->i_sem);
+       mutex_unlock(&devpts_root->d_inode->i_mutex);
 
        return 0;
 }
@@ -227,7 +233,7 @@ struct tty_struct *devpts_get_tty(int number)
                dput(dentry);
        }
 
-       up(&devpts_root->d_inode->i_sem);
+       mutex_unlock(&devpts_root->d_inode->i_mutex);
 
        return tty;
 }
@@ -245,7 +251,7 @@ void devpts_pty_kill(int number)
                }
                dput(dentry);
        }
-       up(&devpts_root->d_inode->i_sem);
+       mutex_unlock(&devpts_root->d_inode->i_mutex);
 }
 
 static int __init init_devpts_fs(void)