btrfs-progs: use btrfs_open_dir in open_path_or_dev_mnt

Use btrfs_open_dir() in open_path_or_dev_mnt() to make the function
return error when target is neither block device nor btrfs mount point.

Also add "verbose" argument to let function output common error
message instead of putting duplicated lines in caller.

Before patch:
  # ./btrfs device stats /mnt/tmp1
  ERROR: getting dev info for devstats failed: Inappropriate ioctl for device
  # ./btrfs replace start /dev/vdd /dev/vde /mnt/tmp1
  ERROR: ioctl(DEV_REPLACE_STATUS) failed on "/mnt/tmp1": Inappropriate ioctl for device

After patch:
  # ./btrfs device stats /mnt/tmp1
  ERROR: not a btrfs filesystem: /mnt/tmp1
  # ./btrfs replace start /dev/vdd /dev/vde /mnt/tmp1
  ERROR: not a btrfs filesystem: /mnt/tmp1

Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/cmds-device.c b/cmds-device.c
index 5f2b952ac16f579cb472868455ac7c9d636a2bfe..a9354f55923d595e208234f10c47479b78e0ba70 100644 (file)
--- a/cmds-device.c
+++ b/cmds-device.c
@@ -385,18 +385,9 @@ static int cmd_device_stats(int argc, char **argv)
 
        dev_path = argv[optind];
 
-       fdmnt = open_path_or_dev_mnt(dev_path, &dirstream);
-
-       if (fdmnt < 0) {
-               if (errno == EINVAL)
-                       fprintf(stderr,
-                               "ERROR: '%s' is not a mounted btrfs device\n",
-                               dev_path);
-               else
-                       fprintf(stderr, "ERROR: can't access '%s': %s\n",
-                               dev_path, strerror(errno));
+       fdmnt = open_path_or_dev_mnt(dev_path, &dirstream, 1);
+       if (fdmnt < 0)
                return 1;
-       }
 
        ret = get_fs_info(dev_path, &fi_args, &di_args);
        if (ret) {

diff --git a/cmds-replace.c b/cmds-replace.c
index 9ab8438eb358ec0fec2fde83d41ccf7b1af75b72..385b76409e908f057c480e7c78b3d3f39ff5c085 100644 (file)
--- a/cmds-replace.c
+++ b/cmds-replace.c
@@ -170,18 +170,9 @@ static int cmd_replace_start(int argc, char **argv)
                usage(cmd_replace_start_usage);
        path = argv[optind + 2];
 
-       fdmnt = open_path_or_dev_mnt(path, &dirstream);
-
-       if (fdmnt < 0) {
-               if (errno == EINVAL)
-                       fprintf(stderr,
-                               "ERROR: '%s' is not a mounted btrfs device\n",
-                               path);
-               else
-                       fprintf(stderr, "ERROR: can't access '%s': %s\n",
-                               path, strerror(errno));
+       fdmnt = open_path_or_dev_mnt(path, &dirstream, 1);
+       if (fdmnt < 0)
                goto leave_with_error;
-       }
 
        /* check for possible errors before backgrounding */
        status_args.cmd = BTRFS_IOCTL_DEV_REPLACE_CMD_STATUS;

diff --git a/cmds-scrub.c b/cmds-scrub.c
index ea6ffc9cfcece7519173932761913aecf29c801a..da614f2f2a64c9c8c46df3c056e203bf95ab9ea5 100644 (file)
--- a/cmds-scrub.c
+++ b/cmds-scrub.c
@@ -1198,17 +1198,9 @@ static int scrub_start(int argc, char **argv, int resume)
 
        path = argv[optind];
 
-       fdmnt = open_path_or_dev_mnt(path, &dirstream);
-
-       if (fdmnt < 0) {
-               if (errno == EINVAL)
-                       error_on(!do_quiet, "'%s' is not a mounted btrfs device",
-                               path);
-               else
-                       error_on(!do_quiet, "can't access '%s': %s",
-                               path, strerror(errno));
+       fdmnt = open_path_or_dev_mnt(path, &dirstream, !do_quiet);
+       if (fdmnt < 0)
                return 1;
-       }
 
        ret = get_fs_info(path, &fi_args, &di_args);
        if (ret) {
@@ -1604,12 +1596,8 @@ static int cmd_scrub_cancel(int argc, char **argv)
 
        path = argv[1];
 
-       fdmnt = open_path_or_dev_mnt(path, &dirstream);
+       fdmnt = open_path_or_dev_mnt(path, &dirstream, 1);
        if (fdmnt < 0) {
-               if (errno == EINVAL)
-                       error("'%s' is not a mounted btrfs device", path);
-               else
-                       error("can't access '%s': %s", path, strerror(errno));
                ret = 1;
                goto out;
        }
@@ -1705,15 +1693,9 @@ static int cmd_scrub_status(int argc, char **argv)
 
        path = argv[optind];
 
-       fdmnt = open_path_or_dev_mnt(path, &dirstream);
-
-       if (fdmnt < 0) {
-               if (errno == EINVAL)
-                       error("'%s' is not a mounted btrfs device", path);
-               else
-                       error("can't access '%s': %s", path, strerror(errno));
+       fdmnt = open_path_or_dev_mnt(path, &dirstream, 1);
+       if (fdmnt < 0)
                return 1;
-       }
 
        ret = get_fs_info(path, &fi_args, &di_args);
        if (ret) {

diff --git a/utils.c b/utils.c
index f1e3248693aae82cebc8b543196906cdab03cea4..6f5df23c17ade183e2fa46a2e40efec3ff449282 100644 (file)
--- a/utils.c
+++ b/utils.c
@@ -1081,27 +1081,28 @@ out:
  *
  * On error, return -1, errno should be set.
  */
-int open_path_or_dev_mnt(const char *path, DIR **dirstream)
+int open_path_or_dev_mnt(const char *path, DIR **dirstream, int verbose)
 {
        char mp[PATH_MAX];
-       int fdmnt;
-
-       fdmnt = is_block_device(path);
-       if (fdmnt == 1) {
-               int ret;
+       int ret;
 
+       if (is_block_device(path)) {
                ret = get_btrfs_mount(path, mp, sizeof(mp));
                if (ret < 0) {
                        /* not a mounted btrfs dev */
+                       error_on(verbose, "'%s' is not a mounted btrfs device",
+                                path);
                        errno = EINVAL;
                        return -1;
                }
-               fdmnt = open_file_or_dir(mp, dirstream);
-       } else if (fdmnt == 0) {
-               fdmnt = open_file_or_dir(path, dirstream);
+               ret = open_file_or_dir(mp, dirstream);
+               error_on(verbose && ret < 0, "can't access '%s': %s",
+                        path, strerror(errno));
+       } else {
+               ret = btrfs_open_dir(path, dirstream, 1);
        }
 
-       return fdmnt;
+       return ret;
 }
 
 /*

diff --git a/utils.h b/utils.h
index 044ea154467cfadb55c60287f2a99512fc28df31..1dc12ec8e67b06bf9e60c859147b9adc4085a27b 100644 (file)
--- a/utils.h
+++ b/utils.h
@@ -158,7 +158,7 @@ char *__strncpy__null(char *dest, const char *src, size_t n);
 int is_block_device(const char *file);
 int is_mount_point(const char *file);
 int check_arg_type(const char *input);
-int open_path_or_dev_mnt(const char *path, DIR **dirstream);
+int open_path_or_dev_mnt(const char *path, DIR **dirstream, int verbose);
 int btrfs_open_dir(const char *path, DIR **dirstream, int verbose);
 u64 btrfs_device_size(int fd, struct stat *st);
 /* Helper to always get proper size of the destination string */