aboutsummaryrefslogtreecommitdiffstats
path: root/cmds-quota.c
diff options
context:
space:
mode:
authorZhao Lei <zhaolei@cn.fujitsu.com>2015-10-12 21:23:01 +0800
committerDavid Sterba <dsterba@suse.com>2015-11-02 09:35:01 +0100
commit5e1a77c45c8447974fe8a315afc0659ce3f64f4c (patch)
treec7e9a795d8e6162b4a34c39986e2a07b19083b6d /cmds-quota.c
parentbbbe7fd7d0f2f104c4c1c54e38524a6496cc9ab6 (diff)
downloadbtrfs-progs-5e1a77c45c8447974fe8a315afc0659ce3f64f4c.tar.gz
btrfs-progs-5e1a77c45c8447974fe8a315afc0659ce3f64f4c.tar.xz
btrfs-progs-5e1a77c45c8447974fe8a315afc0659ce3f64f4c.zip
btrfs-progs: quota: use btrfs_open_dir for btrfs quota command
We can use btrfs_open_dir() to check whether target dir is in btrfs's mount point before open, instead of checking it in kernel space of ioctl, and return fuzzy error message. Before patch: # ./btrfs quota enable /mnt/tmp1 ERROR: quota command failed: Inappropriate ioctl for device # ./btrfs quota disable /mnt/tmp1 ERROR: quota command failed: Inappropriate ioctl for device # ./btrfs quota rescan /mnt/tmp1 ERROR: quota rescan failed: Inappropriate ioctl for device # After patch: # ./btrfs quota enable /mnt/tmp1 ERROR: not a btrfs filesystem: /mnt/tmp1 # ./btrfs quota disable /mnt/tmp1 ERROR: not a btrfs filesystem: /mnt/tmp1 # ./btrfs quota rescan /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>
Diffstat (limited to 'cmds-quota.c')
-rw-r--r--cmds-quota.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/cmds-quota.c b/cmds-quota.c
index 8adc1bf..efbc3ef 100644
--- a/cmds-quota.c
+++ b/cmds-quota.c
@@ -45,11 +45,9 @@ static int quota_ctl(int cmd, int argc, char **argv)
memset(&args, 0, sizeof(args));
args.cmd = cmd;
- fd = open_file_or_dir(path, &dirstream);
- if (fd < 0) {
- fprintf(stderr, "ERROR: can't access '%s'\n", path);
+ fd = btrfs_open_dir(path, &dirstream, 1);
+ if (fd < 0)
return 1;
- }
ret = ioctl(fd, BTRFS_IOC_QUOTA_CTL, &args);
e = errno;
@@ -141,11 +139,9 @@ static int cmd_quota_rescan(int argc, char **argv)
memset(&args, 0, sizeof(args));
path = argv[optind];
- fd = open_file_or_dir(path, &dirstream);
- if (fd < 0) {
- fprintf(stderr, "ERROR: can't access '%s'\n", path);
+ fd = btrfs_open_dir(path, &dirstream, 1);
+ if (fd < 0)
return 1;
- }
ret = ioctl(fd, ioctlnum, &args);
e = errno;