From: David Sterba <dsterba@suse.com>
Date: Mon, 22 Aug 2016 17:14:20 +0000 (+0200)
Subject: btrfs-progs: mkfs: clean up make_image
X-Git-Tag: upstream/4.16.1~1382
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e44415f7134e4b2a9eba403194940260ceecc0f6;p=platform%2Fupstream%2Fbtrfs-progs.git

btrfs-progs: mkfs: clean up make_image

The exact errors are printed, the removed message does not seem to be
necessary. Return proper errors.

Signed-off-by: David Sterba <dsterba@suse.com>
---

diff --git a/mkfs.c b/mkfs.c
index ef0b099..2aa1d5d 100644
--- a/mkfs.c
+++ b/mkfs.c
@@ -1042,16 +1042,14 @@ static int make_image(char *source_dir, struct btrfs_root *root, int out_fd)
 {
 	int ret;
 	struct btrfs_trans_handle *trans;
-
 	struct stat root_st;
-
 	struct directory_name_entry dir_head;
-
 	struct directory_name_entry *dir_entry = NULL;
 
 	ret = lstat(source_dir, &root_st);
 	if (ret) {
 		error("unable to lstat %s: %s", source_dir, strerror(errno));
+		ret = -errno;
 		goto out;
 	}
 
@@ -1080,8 +1078,7 @@ fail:
 		free(dir_entry);
 	}
 out:
-	fprintf(stderr, "Making image is aborted.\n");
-	return -1;
+	return ret;
 }
 
 /*