marko10_000
/
btrfs-progs
forked from Mirrors/btrfs-progs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

btrfs-progs: filesystem: use btrfs_open_dir for btrfs filesystem 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:
  # (/mnt/tmp is not btrfs mountpoint)
  #
  # btrfs filesystem df /mnt/tmp
  ERROR: couldn't get space info - Inappropriate ioctl for device
  ERROR: get_df failed Inappropriate ioctl for device
  #

After patch:
  # ./btrfs filesystem df /mnt/tmp
  ERROR: not btrfs filesystem: /mnt/tmp
  #

Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>
master
Zhao Lei 2015-10-12 21:22:55 +08:00 committed by David Sterba
parent 2dfb710803
commit d0c0f90b38
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmds-fi-usage.c
View File

@ -901,10 +901,8 @@ int cmd_filesystem_usage(int argc, char **argv)
int chunkcount = 0;
int devcount = 0;
fd = open_file_or_dir(argv[i], &dirstream);
fd = btrfs_open_dir(argv[i], &dirstream, 1);
if (fd < 0) {
fprintf(stderr, "ERROR: can't access '%s'\n",
argv[i]);
ret = 1;
goto out;
}

19
cmds-filesystem.c
View File

@ -205,11 +205,10 @@ static int cmd_filesystem_df(int argc, char **argv)
path = argv[1];
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 = get_df(fd, &sargs);
if (ret == 0) {
@ -939,11 +938,9 @@ static int cmd_filesystem_sync(int argc, char **argv)
path = argv[1];
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;
}
printf("FSSync '%s'\n", path);
res = ioctl(fd, BTRFS_IOC_SYNC);
@ -1229,11 +1226,9 @@ static int cmd_filesystem_resize(int argc, char **argv)
return 1;
}
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;
}
printf("Resize '%s' of '%s'\n", path, amount);
memset(&args, 0, sizeof(args));