Signed-off-by: Erez Zadok <ezk@xxxxxxxxxxxxx>
---
fs/unionfs/main.c | 12 ------------
fs/unionfs/super.c | 4 ++--
2 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/fs/unionfs/main.c b/fs/unionfs/main.c
index 6484e2b..0cdd50b 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 f163c08..1f4b3f4 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));
--
1.5.2.2
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
