[PATCH v2 8/16] btrfs-progs: fix resource leak in scrub_start()

[PATCH v2 8/16] btrfs-progs: fix resource leak in scrub_start()

[Wang Shilong]

From: Eric Sandeen <sandeen@redhat.com>

Resolves-Coverity-CID: 1125934
Resolves-Coverity-CID: 1125935
Resolves-Coverity-CID: 1125936
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Wang Shilong <wangsl.fnst@cn.fujitsu.com>
---
v1->v2:
	make sure we are returning right value
---
 cmds-scrub.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/cmds-scrub.c b/cmds-scrub.c
index 605af45..b36e2b1 100644
--- a/cmds-scrub.c
+++ b/cmds-scrub.c
@@ -1096,6 +1096,7 @@ static int scrub_start(int argc, char **argv, int resume)
 	void *terr;
 	u64 devid;
 	DIR *dirstream = NULL;
+	int nothing_to_resume = 0;
 
 	optind = 1;
 	while ((c = getopt(argc, argv, "BdqrRc:n:")) != -1) {
@@ -1261,7 +1262,8 @@ static int scrub_start(int argc, char **argv, int resume)
 		if (!do_quiet)
 			printf("scrub: nothing to resume for %s, fsid %s\n",
 			       path, fsid);
-		return 2;
+		nothing_to_resume = 1;
+		goto out;
 	}
 
 	ret = prg_fd = socket(AF_UNIX, SOCK_STREAM, 0);
@@ -1497,6 +1499,8 @@ out:
 	}
 	close_file_or_dir(fdmnt, dirstream);
 
+	if (nothing_to_resume)
+		return 2;
 	if (err)
 		return 1;
 	if (e_correctable)
-- 
1.8.3.1