btrfs-progs: tests: fixup mount tests of fsck/028-unaligned-super-dev-sizes

[platform/upstream/btrfs-progs.git] / cmds-qgroup.c

diff --git a/cmds-qgroup.c b/cmds-qgroup.c
index 6f07309..4f99e41 100644 (file)
--- a/cmds-qgroup.c
+++ b/cmds-qgroup.c
@@ -26,6 +26,7 @@
 #include "commands.h"
 #include "qgroup.h"
 #include "utils.h"
+#include "help.h"
 
 static const char * const qgroup_cmd_group_usage[] = {
        "btrfs qgroup <command> [options] <path>",
@@ -95,7 +96,7 @@ static int _cmd_qgroup_assign(int assign, int argc, char **argv,
 
        ret = ioctl(fd, BTRFS_IOC_QGROUP_ASSIGN, &args);
        if (ret < 0) {
-               error("unable to assign quota group: %s", strerror(errno));
+               error("unable to assign quota group: %m");
                close_file_or_dir(fd, dirstream);
                return 1;
        }
@@ -116,8 +117,7 @@ static int _cmd_qgroup_assign(int assign, int argc, char **argv,
                        memset(&qargs, 0, sizeof(qargs));
                        ret = ioctl(fd, BTRFS_IOC_QUOTA_RESCAN, &qargs);
                        if (ret < 0)
-                               error("quota rescan failed: %s",
-                                       strerror(errno));
+                               error("quota rescan failed: %m");
                } else {
                        warning("quotas may be inconsistent, rescan needed");
                }
@@ -130,7 +130,6 @@ static int _cmd_qgroup_create(int create, int argc, char **argv)
 {
        int ret = 0;
        int fd;
-       int e;
        char *path;
        struct btrfs_ioctl_qgroup_create_args args;
        DIR *dirstream = NULL;
@@ -148,11 +147,10 @@ static int _cmd_qgroup_create(int create, int argc, char **argv)
                return 1;
 
        ret = ioctl(fd, BTRFS_IOC_QGROUP_CREATE, &args);
-       e = errno;
        close_file_or_dir(fd, dirstream);
        if (ret < 0) {
-               error("unable to %s quota group: %s",
-                       create ? "create":"destroy", strerror(e));
+               error("unable to %s quota group: %m",
+                       create ? "create":"destroy");
                return 1;
        }
        return 0;
@@ -312,10 +310,11 @@ static int cmd_qgroup_show(int argc, char **argv)
        while (1) {
                int c;
                enum {
-                       GETOPT_VAL_SYNC = 256
+                       GETOPT_VAL_SORT = 256,
+                       GETOPT_VAL_SYNC
                };
                static const struct option long_options[] = {
-                       {"sort", required_argument, NULL, 'S'},
+                       {"sort", required_argument, NULL, GETOPT_VAL_SORT},
                        {"sync", no_argument, NULL, GETOPT_VAL_SYNC},
                        { NULL, 0, NULL, 0 }
                };
@@ -346,7 +345,7 @@ static int cmd_qgroup_show(int argc, char **argv)
                case 'f':
                        filter_flag |= 0x2;
                        break;
-               case 'S':
+               case GETOPT_VAL_SORT:
                        ret = btrfs_qgroup_parse_sort_string(optarg,
                                                             &comparer_set);
                        if (ret)
@@ -374,12 +373,8 @@ static int cmd_qgroup_show(int argc, char **argv)
 
        if (sync) {
                ret = ioctl(fd, BTRFS_IOC_SYNC);
-               if (ret < 0) {
-                       error("sync ioctl failed on '%s': %s", path,
-                             strerror(errno));
-                       close_file_or_dir(fd, dirstream);
-                       goto out;
-               }
+               if (ret < 0)
+                       warning("sync ioctl failed on '%s': %m", path);
        }
 
        if (filter_flag) {
@@ -400,10 +395,6 @@ static int cmd_qgroup_show(int argc, char **argv)
                                        qgroupid);
        }
        ret = btrfs_show_qgroups(fd, filter_set, comparer_set);
-       if (ret == -ENOENT)
-               error("can't list qgroups: quotas not enabled");
-       else if (ret < 0)
-               error("can't list qgroups: %s", strerror(-ret));
        close_file_or_dir(fd, dirstream);
 
 out:
@@ -424,7 +415,6 @@ static int cmd_qgroup_limit(int argc, char **argv)
 {
        int ret = 0;
        int fd;
-       int e;
        char *path = NULL;
        struct btrfs_ioctl_qgroup_limit_args args;
        unsigned long long size;
@@ -495,10 +485,9 @@ static int cmd_qgroup_limit(int argc, char **argv)
                return 1;
 
        ret = ioctl(fd, BTRFS_IOC_QGROUP_LIMIT, &args);
-       e = errno;
        close_file_or_dir(fd, dirstream);
        if (ret < 0) {
-               error("unable to limit requested quota group: %s", strerror(e));
+               error("unable to limit requested quota group: %m");
                return 1;
        }
        return 0;