diff options
| author | Gui Hecheng <guihc.fnst@cn.fujitsu.com> | 2014-02-20 10:49:03 +0800 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2014-03-21 06:23:21 -0700 |
| commit | 51a40f6df01ea7e0673bd1b50a0d28e1def345f2 (patch) | |
| tree | 3bdc02616593f84e784eeae2b795736ab13da7f6 | |
| parent | 64fddab8ac0ad7970cf713cfecba5ab6ae90b09c (diff) | |
| download | btrfs-progs-51a40f6df01ea7e0673bd1b50a0d28e1def345f2.tar.gz | |
btrfs-progs: judge the return value of check_mounted more accurately
For btrfs-convert, btrfstune, btrfs rescue, they report "device busy"
when given a device that does not actually exist e.g.
# btrfstune -x abcdefg (this device does not exist)
$ ...device busy...
We deal with this case by add "ret < 0" error check when
judging the return value of check_mounted.
Signed-off-by: Gui Hecheng <guihc.fnst@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <clm@fb.com>
| -rw-r--r-- | btrfs-convert.c | 7 | ||||
| -rw-r--r-- | btrfstune.c | 7 | ||||
| -rw-r--r-- | cmds-rescue.c | 14 |
3 files changed, 23 insertions, 5 deletions
diff --git a/btrfs-convert.c b/btrfs-convert.c index 1b66de7..a8b2c51 100644 --- a/btrfs-convert.c +++ b/btrfs-convert.c @@ -2729,7 +2729,12 @@ int main(int argc, char *argv[]) } file = argv[optind]; - if (check_mounted(file)) { + ret = check_mounted(file); + if (ret < 0) { + fprintf(stderr, "Could not check mount status: %s\n", + strerror(-ret)); + return 1; + } else if (ret) { fprintf(stderr, "%s is mounted\n", file); return 1; } diff --git a/btrfstune.c b/btrfstune.c index 855427f..2c26fe9 100644 --- a/btrfstune.c +++ b/btrfstune.c @@ -151,7 +151,12 @@ int main(int argc, char *argv[]) return 1; } - if (check_mounted(device)) { + ret = check_mounted(device); + if (ret < 0) { + fprintf(stderr, "Could not check mount status: %s\n", + strerror(-ret)); + return 1; + } else if (ret) { fprintf(stderr, "%s is mounted\n", device); return 1; } diff --git a/cmds-rescue.c b/cmds-rescue.c index e18eb98..f20a206 100644 --- a/cmds-rescue.c +++ b/cmds-rescue.c @@ -80,9 +80,13 @@ int cmd_chunk_recover(int argc, char *argv[]) file = argv[optind]; ret = check_mounted(file); - if (ret) { + if (ret < 0) { + fprintf(stderr, "Could not check mount status: %s\n", + strerror(-ret)); + return 1; + } else if (ret) { fprintf(stderr, "the device is busy\n"); - return ret; + return 1; } ret = btrfs_recover_chunk_tree(file, verbose, yes); @@ -133,7 +137,11 @@ int cmd_super_recover(int argc, char **argv) dname = argv[optind]; ret = check_mounted(dname); - if (ret) { + if (ret < 0) { + fprintf(stderr, "Could not check mount status: %s\n", + strerror(-ret)); + return 1; + } else if (ret) { fprintf(stderr, "the device is busy\n"); return 1; } |