From 2477b6de1f687c6cc915709fe120ce5518e355d1 Mon Sep 17 00:00:00 2001 From: Erez Zadok Date: Mon, 28 Jul 2008 00:25:46 -0400 Subject: [PATCH] Unionfs: minor checkpatch fixes Signed-off-by: Erez Zadok --- 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 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)); -- 2.34.1