Unionfs: minor checkpatch fixes

Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>

diff --git a/fs/unionfs/main.c b/fs/unionfs/main.c
index 6484e2bc70b13dff416e55217d0f7891255bde1f..0cdd50b788443028982edcbfda91eb372e747d46 100644 (file)
--- a/fs/unionfs/main.c
+++ b/fs/unionfs/main.c
@@ -459,8 +459,6 @@ static struct unionfs_dentry_info *unionfs_parse_options(
 
        while ((optname = strsep(&options, ",")) != NULL) {
                char *optarg;
-               char *endptr;
-               int intval;
 
                if (!optname || !*optname)
                        continue;
@@ -493,16 +491,6 @@ static struct unionfs_dentry_info *unionfs_parse_options(
                        continue;
                }
 
-               /* All of these options require an integer argument. */
-               intval = simple_strtoul(optarg, &endptr, 0);
-               if (*endptr) {
-                       printk(KERN_ERR
-                              "unionfs: invalid %s option '%s'\n",
-                              optname, optarg);
-                       err = -EINVAL;
-                       goto out_error;
-               }
-
                err = -EINVAL;
                printk(KERN_ERR
                       "unionfs: unrecognized option '%s'\n", optname);

diff --git a/fs/unionfs/super.c b/fs/unionfs/super.c
index f163c08b4043f61d5ebf10c5e663b3c79d14d3c3..1f4b3f448b5c2a9bfc4fa3fa3908ea47e88fe5a2 100644 (file)
--- a/fs/unionfs/super.c
+++ b/fs/unionfs/super.c
@@ -33,8 +33,8 @@ struct inode *unionfs_iget(struct super_block *sb, unsigned long ino)
        inode = iget_locked(sb, ino);
        if (!inode)
                return ERR_PTR(-ENOMEM);
-       if (!(inode->i_state & I_NEW))
-               return inode;
+       if (!(inode->i_state & I_NEW))
+               return inode;
 
        info = UNIONFS_I(inode);
        memset(info, 0, offsetof(struct unionfs_inode_info, vfs_inode));