summary refs log tree commit diff
path: root/fs/f2fs
diff options
context:
space:
mode:
authorQiuyang Sun <sunqiuyang@huawei.com>2018-03-13 19:42:50 +0800
committerJaegeuk Kim <jaegeuk@kernel.org>2018-03-17 13:58:16 +0900
commitda5ce874f8cabe18bc34b50856933108830663bc (patch)
tree9fcaf6124e1570c9993ffbed3276538317e78547 /fs/f2fs
parentbb1105e479fbb8b0edc6f35affec71b75e31c8c0 (diff)
downloadlinux-da5ce874f8cabe18bc34b50856933108830663bc.tar.gz
f2fs: release locks before return in f2fs_ioc_gc_range()
Currently, we will leave the kernel with locks still held when the gc_range
is invalid. This patch fixes the bug.

Signed-off-by: Qiuyang Sun <sunqiuyang@huawei.com>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs/f2fs')
-rw-r--r--fs/f2fs/file.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index c4c27e63daf1..ee88058acd63 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -2059,8 +2059,10 @@ static int f2fs_ioc_gc_range(struct file *filp, unsigned long arg)
 		return ret;
 
 	end = range.start + range.len;
-	if (range.start < MAIN_BLKADDR(sbi) || end >= MAX_BLKADDR(sbi))
-		return -EINVAL;
+	if (range.start < MAIN_BLKADDR(sbi) || end >= MAX_BLKADDR(sbi)) {
+		ret = -EINVAL;
+		goto out;
+	}
 do_more:
 	if (!range.sync) {
 		if (!mutex_trylock(&sbi->gc_mutex)) {