diff options
author | Anand Jain <anand.jain@oracle.com> | 2015-08-28 22:11:30 +0800 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2015-10-02 17:54:29 +0200 |
commit | 54fdddfdc14fa6e9ddf6960cb22d668d83cdf65e (patch) | |
tree | d34a2b250561bb48239b54debce8717efe89ac9a /mkfs.c | |
parent | 5e561cef1d51e6fc6b52460f70b9bca5d4b3ed03 (diff) |
btrfs-progs: fix is_block_device() return checks
it was highlighted to me is_block_device(), returns
1 if the file is a block device,
< 0 in case of an error (eg: file not found)
0 otherwise
This patch makes proper return checks at all the places
where is_block_device() is used. Thanks to Goffredo.
Signed-off-by: Anand Jain <anand.jain@oracle.com>
Suggested-by: Goffredo Baroncelli <kreijack@inwind.it>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'mkfs.c')
-rw-r--r-- | mkfs.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1494,7 +1494,7 @@ int main(int ac, char **av) while (dev_cnt-- > 0) { file = av[optind++]; - if (is_block_device(file)) + if (is_block_device(file) == 1) if (test_dev_for_mkfs(file, force_overwrite)) exit(1); } @@ -1718,7 +1718,7 @@ int main(int ac, char **av) exit(1); } - if (is_block_device(file)) + if (is_block_device(file) == 1) btrfs_register_one_device(file); if (dev_cnt == 0) @@ -1768,7 +1768,7 @@ int main(int ac, char **av) (unsigned long long)device->devid); } - if (is_block_device(file)) + if (is_block_device(file) == 1) btrfs_register_one_device(file); } |