[PATCH 11/20] Btrfs-progs: fix magic return value in cmds-restore.c

[Wang Shilong]

From: Wang Shilong <wangsl.f...@cn.fujitsu.com>

Signed-off-by: Wang Shilong <wangsl.f...@cn.fujitsu.com>
---
 cmds-restore.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/cmds-restore.c b/cmds-restore.c
index 4c87483..04a8382 100644
--- a/cmds-restore.c
+++ b/cmds-restore.c
@@ -247,7 +247,7 @@ static int copy_one_inline(int fd, struct btrfs_path *path, 
u64 pos)
        outbuf = malloc(ram_size);
        if (!outbuf) {
                fprintf(stderr, "No memory\n");
-               return -1;
+               return -ENOMEM;
        }
 
        ret = decompress(buf, outbuf, len, &ram_size, compress);
@@ -305,7 +305,7 @@ static int copy_one_extent(struct btrfs_root *root, int fd,
        inbuf = malloc(disk_size);
        if (!inbuf) {
                fprintf(stderr, "No memory\n");
-               return -1;
+               return -ENOMEM;
        }
 
        if (compress != BTRFS_COMPRESS_NONE) {
@@ -313,7 +313,7 @@ static int copy_one_extent(struct btrfs_root *root, int fd,
                if (!outbuf) {
                        fprintf(stderr, "No memory\n");
                        free(inbuf);
-                       return -1;
+                       return -ENOMEM;
                }
        }
 again:
@@ -543,7 +543,7 @@ static int copy_file(struct btrfs_root *root, int fd, 
struct btrfs_key *key,
        path = btrfs_alloc_path();
        if (!path) {
                fprintf(stderr, "Ran out of memory\n");
-               return -1;
+               return -ENOMEM;
        }
        path->skip_locking = 1;
 
@@ -676,7 +676,7 @@ static int search_dir(struct btrfs_root *root, struct 
btrfs_key *key,
        path = btrfs_alloc_path();
        if (!path) {
                fprintf(stderr, "Ran out of memory\n");
-               return -1;
+               return -ENOMEM;
        }
        path->skip_locking = 1;
 
@@ -823,7 +823,7 @@ static int search_dir(struct btrfs_root *root, struct 
btrfs_key *key,
                        if (!dir) {
                                fprintf(stderr, "Ran out of memory\n");
                                btrfs_free_path(path);
-                               return -1;
+                               return -ENOMEM;
                        }
 
                        if (location.type == BTRFS_ROOT_ITEM_KEY) {
@@ -917,7 +917,7 @@ static int do_list_roots(struct btrfs_root *root)
        path = btrfs_alloc_path();
        if (!path) {
                fprintf(stderr, "Failed to alloc path\n");
-               return -1;
+               return -ENOMEM;
        }
 
        key.offset = 0;
@@ -1210,7 +1210,7 @@ int cmd_restore(int argc, char **argv)
        if ((ret = check_mounted(argv[optind])) < 0) {
                fprintf(stderr, "Could not check mount status: %s\n",
                        strerror(-ret));
-               return ret;
+               return 1;
        } else if (ret) {
                fprintf(stderr, "%s is currently mounted.  Aborting.\n", 
argv[optind]);
                return 1;
@@ -1284,5 +1284,5 @@ out:
        if (mreg)
                regfree(mreg);
        close_ctree(root);
-       return ret;
+       return !!ret;
 }
-- 
1.7.11.7

--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html