projects
/
platform
/
upstream
/
btrfs-progs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
7c5532c
..
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 "commands.h"
#include "qgroup.h"
#include "utils.h"
+#include "help.h"
static const char * const qgroup_cmd_group_usage[] = {
"btrfs qgroup <command> [options] <path>",
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) {
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;
}
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)
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");
}
} 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 ret = 0;
int fd;
- int e;
char *path;
struct btrfs_ioctl_qgroup_create_args args;
DIR *dirstream = NULL;
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);
return 1;
ret = ioctl(fd, BTRFS_IOC_QGROUP_CREATE, &args);
- e = errno;
close_file_or_dir(fd, dirstream);
if (ret < 0) {
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;
return 1;
}
return 0;
@@
-272,8
+270,7
@@
static int cmd_qgroup_destroy(int argc, char **argv)
}
static const char * const cmd_qgroup_show_usage[] = {
}
static const char * const cmd_qgroup_show_usage[] = {
- "btrfs qgroup show -pcreFf "
- "[--sort=qgroupid,rfer,excl,max_rfer,max_excl] <path>",
+ "btrfs qgroup show [options] <path>",
"Show subvolume quota groups.",
"-p print parent qgroup id",
"-c print child qgroup id",
"Show subvolume quota groups.",
"-p print parent qgroup id",
"-c print child qgroup id",
@@
-288,6
+285,7
@@
static const char * const cmd_qgroup_show_usage[] = {
" list qgroups sorted by specified items",
" you can use '+' or '-' in front of each item.",
" (+:ascending, -:descending, ascending default)",
" list qgroups sorted by specified items",
" you can use '+' or '-' in front of each item.",
" (+:ascending, -:descending, ascending default)",
+ "--sync force sync of the filesystem before getting info",
NULL
};
NULL
};
@@
-296,11
+294,11
@@
static int cmd_qgroup_show(int argc, char **argv)
char *path;
int ret = 0;
int fd;
char *path;
int ret = 0;
int fd;
- int e;
DIR *dirstream = NULL;
u64 qgroupid;
int filter_flag = 0;
unsigned unit_mode;
DIR *dirstream = NULL;
u64 qgroupid;
int filter_flag = 0;
unsigned unit_mode;
+ int sync = 0;
struct btrfs_qgroup_comparer_set *comparer_set;
struct btrfs_qgroup_filter_set *filter_set;
struct btrfs_qgroup_comparer_set *comparer_set;
struct btrfs_qgroup_filter_set *filter_set;
@@
-311,8
+309,13
@@
static int cmd_qgroup_show(int argc, char **argv)
while (1) {
int c;
while (1) {
int c;
+ enum {
+ GETOPT_VAL_SORT = 256,
+ GETOPT_VAL_SYNC
+ };
static const struct option long_options[] = {
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 }
};
{ NULL, 0, NULL, 0 }
};
@@
-342,12
+345,15
@@
static int cmd_qgroup_show(int argc, char **argv)
case 'f':
filter_flag |= 0x2;
break;
case 'f':
filter_flag |= 0x2;
break;
- case
'S'
:
+ case
GETOPT_VAL_SORT
:
ret = btrfs_qgroup_parse_sort_string(optarg,
&comparer_set);
if (ret)
usage(cmd_qgroup_show_usage);
break;
ret = btrfs_qgroup_parse_sort_string(optarg,
&comparer_set);
if (ret)
usage(cmd_qgroup_show_usage);
break;
+ case GETOPT_VAL_SYNC:
+ sync = 1;
+ break;
default:
usage(cmd_qgroup_show_usage);
}
default:
usage(cmd_qgroup_show_usage);
}
@@
-365,8
+371,14
@@
static int cmd_qgroup_show(int argc, char **argv)
return 1;
}
return 1;
}
+ if (sync) {
+ ret = ioctl(fd, BTRFS_IOC_SYNC);
+ if (ret < 0)
+ warning("sync ioctl failed on '%s': %m", path);
+ }
+
if (filter_flag) {
if (filter_flag) {
- ret = lookup_
ino
_rootid(fd, &qgroupid);
+ ret = lookup_
path
_rootid(fd, &qgroupid);
if (ret < 0) {
error("cannot resolve rootid for %s: %s",
path, strerror(-ret));
if (ret < 0) {
error("cannot resolve rootid for %s: %s",
path, strerror(-ret));
@@
-383,10
+395,7
@@
static int cmd_qgroup_show(int argc, char **argv)
qgroupid);
}
ret = btrfs_show_qgroups(fd, filter_set, comparer_set);
qgroupid);
}
ret = btrfs_show_qgroups(fd, filter_set, comparer_set);
- e = errno;
close_file_or_dir(fd, dirstream);
close_file_or_dir(fd, dirstream);
- if (ret < 0)
- error("can't list qgroups: %s", strerror(e));
out:
return !!ret;
out:
return !!ret;
@@
-406,7
+415,6
@@
static int cmd_qgroup_limit(int argc, char **argv)
{
int ret = 0;
int fd;
{
int ret = 0;
int fd;
- int e;
char *path = NULL;
struct btrfs_ioctl_qgroup_limit_args args;
unsigned long long size;
char *path = NULL;
struct btrfs_ioctl_qgroup_limit_args args;
unsigned long long size;
@@
-477,10
+485,9
@@
static int cmd_qgroup_limit(int argc, char **argv)
return 1;
ret = ioctl(fd, BTRFS_IOC_QGROUP_LIMIT, &args);
return 1;
ret = ioctl(fd, BTRFS_IOC_QGROUP_LIMIT, &args);
- e = errno;
close_file_or_dir(fd, dirstream);
if (ret < 0) {
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;
return 1;
}
return 0;