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 /btrfs-convert.c | |
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>
Diffstat (limited to 'btrfs-convert.c')
-rw-r--r-- | btrfs-convert.c | 7 |
1 files changed, 6 insertions, 1 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; } |