From: Erez Zadok <ezk@cs.sunysb.edu>
Date: Mon, 28 Jul 2008 04:25:46 +0000 (-0400)
Subject: Unionfs: minor checkpatch fixes
X-Git-Tag: unionfs-2.4~6
X-Git-Url: https://git.fsl.cs.sunysb.edu/?a=commitdiff_plain;h=c77552f1dea1de04a791ecaa0bd5c0621014140a;p=unionfs-2.6.31.y.git

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 6484e2bc70b..0cdd50b7884 100644
--- 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 f163c08b404..1f4b3f448b5 100644
--- 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));