btrfs-progs: mkfs: clean up make_image
authorDavid Sterba <dsterba@suse.com>
Mon, 22 Aug 2016 17:14:20 +0000 (19:14 +0200)
committerDavid Sterba <dsterba@suse.com>
Wed, 24 Aug 2016 12:37:36 +0000 (14:37 +0200)
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>
mkfs.c

diff --git a/mkfs.c b/mkfs.c
index ef0b099..2aa1d5d 100644 (file)
--- 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;
 }
 
 /*