diff --git a/cmds-fi-usage.c b/cmds-fi-usage.c index 50d63337..5fefed46 100644 --- a/cmds-fi-usage.c +++ b/cmds-fi-usage.c @@ -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; } diff --git a/cmds-filesystem.c b/cmds-filesystem.c index 36637347..91bf1fa0 100644 --- a/cmds-filesystem.c +++ b/cmds-filesystem.c @@ -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));