Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ffff285 authored by Luis Henriques's avatar Luis Henriques Committed by Jaegeuk Kim
Browse files

f2fs: remove extra inode_unlock() in error path 



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: 0abd675e ("f2fs: support plain user/group quota")
Signed-off-by: default avatarLuis Henriques <lhenriques@suse.com>
Reviewed-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 5771a8c0

fs/f2fs/file.c

+1 −4
Original line number Diff line number Diff line
@@ -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;

}