linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c
index 1e5a577..caba0b5 100644 (file)
--- a/fs/devpts/inode.c
+++ b/fs/devpts/inode.c
@@ -18,8 +18,6 @@
 #include <linux/mount.h>
 #include <linux/tty.h>
 #include <linux/devpts_fs.h>
-#include <linux/parser.h>
-#include <linux/vs_base.h>
 
 
 static int devpts_permission(struct inode *inode, int mask, struct nameidata *nd)
@@ -46,60 +44,39 @@ 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)
 {
-       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)
+       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)
                        continue;
-
-               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");
+               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");
                        return -EINVAL;
                }
        }
+       config.setuid  = setuid;
+       config.setgid  = setgid;
+       config.uid     = uid;
+       config.gid     = gid;
+       config.mode    = mode;
 
        return 0;
 }