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: Use fs_info instead of root for BTRFS_MAX_XATTR_SIZE
[platform/upstream/btrfs-progs.git]
/
cmds-qgroup.c
diff --git
a/cmds-qgroup.c
b/cmds-qgroup.c
index
38382ea
..
4f99e41
100644
(file)
--- a/
cmds-qgroup.c
+++ b/
cmds-qgroup.c
@@
-96,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;
}
@@
-117,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");
}
@@
-131,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;
@@
-149,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;
@@
-377,8
+374,7
@@
static int cmd_qgroup_show(int argc, char **argv)
if (sync) {
ret = ioctl(fd, BTRFS_IOC_SYNC);
if (ret < 0)
if (sync) {
ret = ioctl(fd, BTRFS_IOC_SYNC);
if (ret < 0)
- warning("sync ioctl failed on '%s': %s", path,
- strerror(errno));
+ warning("sync ioctl failed on '%s': %m", path);
}
if (filter_flag) {
}
if (filter_flag) {
@@
-399,10
+395,6
@@
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);
- 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:
close_file_or_dir(fd, dirstream);
out:
@@
-423,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;
@@
-494,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;