f2fs: remove extra inode_unlock() in error path

Luis Henriques · Jaegeuk Kim · commit 5ffff2854a0b · 2017-07-15T21:10:23.000-07:00
This commit removes an extra inode_unlock() that is being done in function f2fs_ioc_setflags error path. While there, get rid of a useless 'out' label as well. Fixes: 0abd675 ("f2fs: support plain user/group quota") Signed-off-by: Luis Henriques <lhenriques@suse.com> Reviewed-by: Chao Yu <yuchao0@huawei.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
@@ -1538,7 +1538,6 @@ static int f2fs_ioc_setflags(struct file *filp, unsigned long arg)
 
 	/* Is it quota file? Do not allow user to mess with it */
 	if (IS_NOQUOTA(inode)) {
-		inode_unlock(inode);
 		ret = -EPERM;
 		goto unlock_out;
 	}
@@ -1549,9 +1548,8 @@ static int f2fs_ioc_setflags(struct file *filp, unsigned long arg)
 
 	if ((flags ^ oldflags) & (FS_APPEND_FL | FS_IMMUTABLE_FL)) {
 		if (!capable(CAP_LINUX_IMMUTABLE)) {
-			inode_unlock(inode);
 			ret = -EPERM;
-			goto out;
+			goto unlock_out;
 		}
 	}
 
@@ -1564,7 +1562,6 @@ static int f2fs_ioc_setflags(struct file *filp, unsigned long arg)
 	f2fs_mark_inode_dirty_sync(inode, false);
 unlock_out:
 	inode_unlock(inode);
-out:
 	mnt_drop_write_file(filp);
 	return ret;
 }

Original file line number	Diff line number	Diff line change
`@@ -1538,7 +1538,6 @@ static int f2fs_ioc_setflags(struct file *filp, unsigned long arg)`
`1538`	`1538`
`1539`	`1539`	`/* Is it quota file? Do not allow user to mess with it */`
`1540`	`1540`	`if (IS_NOQUOTA(inode)) {`
`1541`		`- inode_unlock(inode);`
`1542`	`1541`	`ret = -EPERM;`
`1543`	`1542`	`goto unlock_out;`
`1544`	`1543`	`}`
`@@ -1549,9 +1548,8 @@ static int f2fs_ioc_setflags(struct file *filp, unsigned long arg)`
`1549`	`1548`
`1550`	`1549`	`if ((flags ^ oldflags) & (FS_APPEND_FL \| FS_IMMUTABLE_FL)) {`
`1551`	`1550`	`if (!capable(CAP_LINUX_IMMUTABLE)) {`
`1552`		`- inode_unlock(inode);`
`1553`	`1551`	`ret = -EPERM;`
`1554`		`- goto out;`
	`1552`	`+ goto unlock_out;`
`1555`	`1553`	`}`
`1556`	`1554`	`}`
`1557`	`1555`
`@@ -1564,7 +1562,6 @@ static int f2fs_ioc_setflags(struct file *filp, unsigned long arg)`
`1564`	`1562`	`f2fs_mark_inode_dirty_sync(inode, false);`
`1565`	`1563`	`unlock_out:`
`1566`	`1564`	`inode_unlock(inode);`
`1567`		`-out:`
`1568`	`1565`	`mnt_drop_write_file(filp);`
`1569`	`1566`	`return ret;`
`1570`	`1567`	`}`