#include "version.h"
#include "commands.h"
#include "list_sort.h"
+#include "disk-io.h"
+
+
+/*
+ * for btrfs fi show, we maintain a hash of fsids we've already printed.
+ * This way we don't print dups if a given FS is mounted more than once.
+ */
+#define SEEN_FSID_HASH_SIZE 256
+
+struct seen_fsid {
+ u8 fsid[BTRFS_FSID_SIZE];
+ struct seen_fsid *next;
+};
+
+static struct seen_fsid *seen_fsid_hash[SEEN_FSID_HASH_SIZE] = {NULL,};
+
+static int is_seen_fsid(u8 *fsid)
+{
+ u8 hash = fsid[0];
+ int slot = hash % SEEN_FSID_HASH_SIZE;
+ struct seen_fsid *seen = seen_fsid_hash[slot];
+
+ return seen ? 1 : 0;
+}
+
+static int add_seen_fsid(u8 *fsid)
+{
+ u8 hash = fsid[0];
+ int slot = hash % SEEN_FSID_HASH_SIZE;
+ struct seen_fsid *seen = seen_fsid_hash[slot];
+ struct seen_fsid *alloc;
+
+ if (!seen)
+ goto insert;
+
+ while (1) {
+ if (memcmp(seen->fsid, fsid, BTRFS_FSID_SIZE) == 0)
+ return -EEXIST;
+
+ if (!seen->next)
+ break;
+
+ seen = seen->next;
+ }
+
+insert:
+
+ alloc = malloc(sizeof(*alloc));
+ if (!alloc)
+ return -ENOMEM;
+
+ alloc->next = NULL;
+ memcpy(alloc->fsid, fsid, BTRFS_FSID_SIZE);
+
+ if (seen)
+ seen->next = alloc;
+ else
+ seen_fsid_hash[slot] = alloc;
+
+ return 0;
+}
+
+static void free_seen_fsid(void)
+{
+ int slot;
+ struct seen_fsid *seen;
+ struct seen_fsid *next;
+
+ for (slot = 0; slot < SEEN_FSID_HASH_SIZE; slot++) {
+ seen = seen_fsid_hash[slot];
+ while (seen) {
+ next = seen->next;
+ free(seen);
+ seen = next;
+ }
+ seen_fsid_hash[slot] = NULL;
+ }
+}
static const char * const filesystem_cmd_group_usage[] = {
"btrfs filesystem [<group>] <command> [<args>]",
};
static const char * const cmd_df_usage[] = {
- "btrfs filesystem df <path>",
- "Show space usage information for a mount point",
- NULL
+ "btrfs filesystem df [options] <path>",
+ "Show space usage information for a mount point",
+ "-b|--raw raw numbers in bytes",
+ "-h human friendly numbers, base 1024 (default)",
+ "-H human friendly numbers, base 1000",
+ "--iec use 1024 as a base (KiB, MiB, GiB, TiB)",
+ "--si use 1000 as a base (kB, MB, GB, TB)",
+ "-k|--kbytes show sizes in KiB, or kB with --si",
+ "-m|--mbytes show sizes in MiB, or MB with --si",
+ "-g|--gbytes show sizes in GiB, or GB with --si",
+ "-t|--tbytes show sizes in TiB, or TB with --si",
+ NULL
};
static char *group_type_str(u64 flag)
{
- switch (flag & BTRFS_BLOCK_GROUP_TYPE_MASK) {
+ u64 mask = BTRFS_BLOCK_GROUP_TYPE_MASK |
+ BTRFS_SPACE_INFO_GLOBAL_RSV;
+
+ switch (flag & mask) {
case BTRFS_BLOCK_GROUP_DATA:
return "Data";
case BTRFS_BLOCK_GROUP_SYSTEM:
return "Metadata";
case BTRFS_BLOCK_GROUP_DATA|BTRFS_BLOCK_GROUP_METADATA:
return "Data+Metadata";
+ case BTRFS_SPACE_INFO_GLOBAL_RSV:
+ return "GlobalReserve";
default:
return "unknown";
}
sargs = malloc(sizeof(struct btrfs_ioctl_space_args) +
(count * sizeof(struct btrfs_ioctl_space_info)));
if (!sargs)
- ret = -ENOMEM;
+ return -ENOMEM;
sargs->space_slots = count;
sargs->total_spaces = 0;
return 0;
}
-static void print_df(struct btrfs_ioctl_space_args *sargs)
+static void print_df(struct btrfs_ioctl_space_args *sargs, unsigned unit_mode)
{
u64 i;
struct btrfs_ioctl_space_info *sp = sargs->spaces;
printf("%s, %s: total=%s, used=%s\n",
group_type_str(sp->flags),
group_profile_str(sp->flags),
- pretty_size(sp->total_bytes),
- pretty_size(sp->used_bytes));
+ pretty_size_mode(sp->total_bytes, unit_mode),
+ pretty_size_mode(sp->used_bytes, unit_mode));
}
}
int ret;
int fd;
char *path;
- DIR *dirstream = NULL;
+ DIR *dirstream = NULL;
+ unsigned unit_mode = UNITS_DEFAULT;
- if (check_argc_exact(argc, 2))
+ while (1) {
+ int long_index;
+ static const struct option long_options[] = {
+ { "raw", no_argument, NULL, 'b'},
+ { "kbytes", no_argument, NULL, 'k'},
+ { "mbytes", no_argument, NULL, 'm'},
+ { "gbytes", no_argument, NULL, 'g'},
+ { "tbytes", no_argument, NULL, 't'},
+ { "si", no_argument, NULL, 256},
+ { "iec", no_argument, NULL, 257},
+ };
+ int c = getopt_long(argc, argv, "bhHkmgt", long_options,
+ &long_index);
+ if (c < 0)
+ break;
+ switch (c) {
+ case 'b':
+ unit_mode = UNITS_RAW;
+ break;
+ case 'k':
+ units_set_base(&unit_mode, UNITS_KBYTES);
+ break;
+ case 'm':
+ units_set_base(&unit_mode, UNITS_MBYTES);
+ break;
+ case 'g':
+ units_set_base(&unit_mode, UNITS_GBYTES);
+ break;
+ case 't':
+ units_set_base(&unit_mode, UNITS_TBYTES);
+ break;
+ case 'h':
+ unit_mode = UNITS_HUMAN_BINARY;
+ break;
+ case 'H':
+ unit_mode = UNITS_HUMAN_DECIMAL;
+ break;
+ case 256:
+ units_set_mode(&unit_mode, UNITS_DECIMAL);
+ break;
+ case 257:
+ units_set_mode(&unit_mode, UNITS_BINARY);
+ break;
+ default:
+ usage(cmd_df_usage);
+ }
+ }
+
+ if (check_argc_exact(argc, optind + 1))
usage(cmd_df_usage);
- path = argv[1];
+ path = argv[optind];
fd = open_file_or_dir(path, &dirstream);
if (fd < 0) {
- fprintf(stderr, "ERROR: can't access to '%s'\n", path);
+ fprintf(stderr, "ERROR: can't access '%s'\n", path);
return 1;
}
ret = get_df(fd, &sargs);
- if (!ret && sargs) {
- print_df(sargs);
+ if (ret == 0) {
+ print_df(sargs, unit_mode);
free(sargs);
} else {
fprintf(stderr, "ERROR: get_df failed %s\n", strerror(-ret));
return !!ret;
}
+static int match_search_item_kernel(__u8 *fsid, char *mnt, char *label,
+ char *search)
+{
+ char uuidbuf[BTRFS_UUID_UNPARSED_SIZE];
+ int search_len = strlen(search);
+
+ search_len = min(search_len, BTRFS_UUID_UNPARSED_SIZE);
+ uuid_unparse(fsid, uuidbuf);
+ if (!strncmp(uuidbuf, search, search_len))
+ return 1;
+
+ if (strlen(label) && strcmp(label, search) == 0)
+ return 1;
+
+ if (strcmp(mnt, search) == 0)
+ return 1;
+
+ return 0;
+}
+
static int uuid_search(struct btrfs_fs_devices *fs_devices, char *search)
{
- char uuidbuf[37];
+ char uuidbuf[BTRFS_UUID_UNPARSED_SIZE];
struct list_head *cur;
struct btrfs_device *device;
int search_len = strlen(search);
- search_len = min(search_len, 37);
+ search_len = min(search_len, BTRFS_UUID_UNPARSED_SIZE);
uuid_unparse(fs_devices->fsid, uuidbuf);
if (!strncmp(uuidbuf, search, search_len))
return 1;
da->devid > db->devid ? 1 : 0;
}
+static void splice_device_list(struct list_head *seed_devices,
+ struct list_head *all_devices)
+{
+ struct btrfs_device *in_all, *next_all;
+ struct btrfs_device *in_seed, *next_seed;
+
+ list_for_each_entry_safe(in_all, next_all, all_devices, dev_list) {
+ list_for_each_entry_safe(in_seed, next_seed, seed_devices,
+ dev_list) {
+ if (in_all->devid == in_seed->devid) {
+ /*
+ * When do dev replace in a sprout fs
+ * to a dev in its seed fs, the replacing
+ * dev will reside in the sprout fs and
+ * the replaced dev will still exist
+ * in the seed fs.
+ * So pick the latest one when showing
+ * the sprout fs.
+ */
+ if (in_all->generation
+ < in_seed->generation) {
+ list_del(&in_all->dev_list);
+ free(in_all);
+ } else if (in_all->generation
+ > in_seed->generation) {
+ list_del(&in_seed->dev_list);
+ free(in_seed);
+ }
+ break;
+ }
+ }
+ }
+
+ list_splice(seed_devices, all_devices);
+}
+
+static void print_devices(struct btrfs_fs_devices *fs_devices,
+ u64 *devs_found)
+{
+ struct btrfs_device *device;
+ struct btrfs_fs_devices *cur_fs;
+ struct list_head *all_devices;
+
+ all_devices = &fs_devices->devices;
+ cur_fs = fs_devices->seed;
+ /* add all devices of seed fs to the fs to be printed */
+ while (cur_fs) {
+ splice_device_list(&cur_fs->devices, all_devices);
+ cur_fs = cur_fs->seed;
+ }
+
+ list_sort(NULL, all_devices, cmp_device_id);
+ list_for_each_entry(device, all_devices, dev_list) {
+ printf("\tdevid %4llu size %s used %s path %s\n",
+ (unsigned long long)device->devid,
+ pretty_size(device->total_bytes),
+ pretty_size(device->bytes_used), device->name);
+
+ (*devs_found)++;
+ }
+}
+
static void print_one_uuid(struct btrfs_fs_devices *fs_devices)
{
- char uuidbuf[37];
- struct list_head *cur;
+ char uuidbuf[BTRFS_UUID_UNPARSED_SIZE];
struct btrfs_device *device;
u64 devs_found = 0;
u64 total;
+ if (add_seen_fsid(fs_devices->fsid))
+ return;
+
uuid_unparse(fs_devices->fsid, uuidbuf);
device = list_entry(fs_devices->devices.next, struct btrfs_device,
dev_list);
else
printf("Label: none ");
-
total = device->total_devs;
printf(" uuid: %s\n\tTotal devices %llu FS bytes used %s\n", uuidbuf,
(unsigned long long)total,
pretty_size(device->super_bytes_used));
- list_sort(NULL, &fs_devices->devices, cmp_device_id);
- list_for_each(cur, &fs_devices->devices) {
- device = list_entry(cur, struct btrfs_device, dev_list);
-
- printf("\tdevid %4llu size %s used %s path %s\n",
- (unsigned long long)device->devid,
- pretty_size(device->total_bytes),
- pretty_size(device->bytes_used), device->name);
+ print_devices(fs_devices, &devs_found);
- devs_found++;
- }
if (devs_found < total) {
printf("\t*** Some devices missing\n");
}
char *label, char *path)
{
int i;
- char uuidbuf[37];
+ int fd;
+ int missing = 0;
+ char uuidbuf[BTRFS_UUID_UNPARSED_SIZE];
struct btrfs_ioctl_dev_info_args *tmp_dev_info;
+ int ret;
+
+ ret = add_seen_fsid(fs_info->fsid);
+ if (ret == -EEXIST)
+ return 0;
+ else if (ret)
+ return ret;
uuid_unparse(fs_info->fsid, uuidbuf);
- printf("Label: %s uuid: %s\n",
- strlen(label) ? label : "none", uuidbuf);
+ if (label && strlen(label))
+ printf("Label: '%s' ", label);
+ else
+ printf("Label: none ");
- printf("\tTotal devices %llu FS bytes used %s\n",
- fs_info->num_devices,
+ printf(" uuid: %s\n\tTotal devices %llu FS bytes used %s\n", uuidbuf,
+ fs_info->num_devices,
pretty_size(calc_used_bytes(space_info)));
for (i = 0; i < fs_info->num_devices; i++) {
tmp_dev_info = (struct btrfs_ioctl_dev_info_args *)&dev_info[i];
- printf("\tdevid %llu size %s used %s path %s\n",
+
+ /* Add check for missing devices even mounted */
+ fd = open((char *)tmp_dev_info->path, O_RDONLY);
+ if (fd < 0) {
+ missing = 1;
+ continue;
+ }
+ close(fd);
+ printf("\tdevid %4llu size %s used %s path %s\n",
tmp_dev_info->devid,
pretty_size(tmp_dev_info->total_bytes),
pretty_size(tmp_dev_info->bytes_used),
tmp_dev_info->path);
}
+ if (missing)
+ printf("\t*** Some devices missing\n");
printf("\n");
return 0;
}
char path[PATH_MAX];
if (!input)
- return BTRFS_ARG_UNKNOWN;
+ return -EINVAL;
if (realpath(input, path)) {
- if (is_block_device(input) == 1)
+ if (is_block_device(path) == 1)
return BTRFS_ARG_BLKDEV;
- if (is_mount_point(input) == 1)
+ if (is_mount_point(path) == 1)
return BTRFS_ARG_MNTPOINT;
return BTRFS_ARG_UNKNOWN;
}
- if (!uuid_parse(input, out))
+ if (strlen(input) == (BTRFS_UUID_UNPARSED_SIZE - 1) &&
+ !uuid_parse(input, out))
return BTRFS_ARG_UUID;
return BTRFS_ARG_UNKNOWN;
static int btrfs_scan_kernel(void *search)
{
- int ret = 0, fd, type;
+ int ret = 0, fd;
+ int found = 0;
FILE *f;
struct mntent *mnt;
struct btrfs_ioctl_fs_info_args fs_info_arg;
struct btrfs_ioctl_dev_info_args *dev_info_arg = NULL;
- struct btrfs_ioctl_space_args *space_info_arg;
+ struct btrfs_ioctl_space_args *space_info_arg = NULL;
char label[BTRFS_LABEL_SIZE];
- uuid_t uuid;
f = setmntent("/proc/self/mounts", "r");
if (f == NULL)
return 1;
- type = check_arg_type(search);
- if (type == BTRFS_ARG_BLKDEV)
- return 1;
-
+ memset(label, 0, sizeof(label));
while ((mnt = getmntent(f)) != NULL) {
if (strcmp(mnt->mnt_type, "btrfs"))
continue;
ret = get_fs_info(mnt->mnt_dir, &fs_info_arg,
&dev_info_arg);
if (ret)
- return ret;
-
- switch (type) {
- case BTRFS_ARG_UUID:
- ret = uuid_parse(search, uuid);
- if (ret)
- return 1;
- if (uuid_compare(fs_info_arg.fsid, uuid))
- continue;
- break;
- case BTRFS_ARG_MNTPOINT:
- if (strcmp(search, mnt->mnt_dir))
- continue;
- break;
- case BTRFS_ARG_UNKNOWN:
- break;
+ goto out;
+
+ if (get_label_mounted(mnt->mnt_dir, label)) {
+ kfree(dev_info_arg);
+ goto out;
+ }
+ if (search && !match_search_item_kernel(fs_info_arg.fsid,
+ mnt->mnt_dir, label, search)) {
+ kfree(dev_info_arg);
+ continue;
}
fd = open(mnt->mnt_dir, O_RDONLY);
if ((fd != -1) && !get_df(fd, &space_info_arg)) {
- get_label_mounted(mnt->mnt_dir, label);
print_one_fs(&fs_info_arg, dev_info_arg,
space_info_arg, label, mnt->mnt_dir);
- free(space_info_arg);
+ kfree(space_info_arg);
+ memset(label, 0, sizeof(label));
+ found = 1;
}
if (fd != -1)
close(fd);
- free(dev_info_arg);
+ kfree(dev_info_arg);
+ }
+
+out:
+ endmntent(f);
+ return !found;
+}
+
+static int dev_to_fsid(char *dev, __u8 *fsid)
+{
+ struct btrfs_super_block *disk_super;
+ char *buf;
+ int ret;
+ int fd;
+
+ buf = malloc(4096);
+ if (!buf)
+ return -ENOMEM;
+
+ fd = open(dev, O_RDONLY);
+ if (fd < 0) {
+ ret = -errno;
+ free(buf);
+ return ret;
}
+
+ disk_super = (struct btrfs_super_block *)buf;
+ ret = btrfs_read_dev_super(fd, disk_super,
+ BTRFS_SUPER_INFO_OFFSET, 0);
+ if (ret)
+ goto out;
+
+ memcpy(fsid, disk_super->fsid, BTRFS_FSID_SIZE);
+ ret = 0;
+
+out:
+ close(fd);
+ free(buf);
return ret;
}
+static void free_fs_devices(struct btrfs_fs_devices *fs_devices)
+{
+ struct btrfs_fs_devices *cur_seed, *next_seed;
+ struct btrfs_device *device;
+
+ while (!list_empty(&fs_devices->devices)) {
+ device = list_entry(fs_devices->devices.next,
+ struct btrfs_device, dev_list);
+ list_del(&device->dev_list);
+
+ free(device->name);
+ free(device->label);
+ free(device);
+ }
+
+ /* free seed fs chain */
+ cur_seed = fs_devices->seed;
+ fs_devices->seed = NULL;
+ while (cur_seed) {
+ next_seed = cur_seed->seed;
+ free(cur_seed);
+
+ cur_seed = next_seed;
+ }
+
+ list_del(&fs_devices->list);
+ free(fs_devices);
+}
+
+static int copy_device(struct btrfs_device *dst,
+ struct btrfs_device *src)
+{
+ dst->devid = src->devid;
+ memcpy(dst->uuid, src->uuid, BTRFS_UUID_SIZE);
+ if (src->name == NULL)
+ dst->name = NULL;
+ else {
+ dst->name = strdup(src->name);
+ if (!dst->name)
+ return -ENOMEM;
+ }
+ if (src->label == NULL)
+ dst->label = NULL;
+ else {
+ dst->label = strdup(src->label);
+ if (!dst->label) {
+ free(dst->name);
+ return -ENOMEM;
+ }
+ }
+ dst->total_devs = src->total_devs;
+ dst->super_bytes_used = src->super_bytes_used;
+ dst->total_bytes = src->total_bytes;
+ dst->bytes_used = src->bytes_used;
+ dst->generation = src->generation;
+
+ return 0;
+}
+
+static int copy_fs_devices(struct btrfs_fs_devices *dst,
+ struct btrfs_fs_devices *src)
+{
+ struct btrfs_device *cur_dev, *dev_copy;
+ int ret = 0;
+
+ memcpy(dst->fsid, src->fsid, BTRFS_FSID_SIZE);
+ INIT_LIST_HEAD(&dst->devices);
+ dst->seed = NULL;
+
+ list_for_each_entry(cur_dev, &src->devices, dev_list) {
+ dev_copy = malloc(sizeof(*dev_copy));
+ if (!dev_copy) {
+ ret = -ENOMEM;
+ break;
+ }
+
+ ret = copy_device(dev_copy, cur_dev);
+ if (ret) {
+ free(dev_copy);
+ break;
+ }
+
+ list_add(&dev_copy->dev_list, &dst->devices);
+ dev_copy->fs_devices = dst;
+ }
+
+ return ret;
+}
+
+static int find_and_copy_seed(struct btrfs_fs_devices *seed,
+ struct btrfs_fs_devices *copy,
+ struct list_head *fs_uuids) {
+ struct btrfs_fs_devices *cur_fs;
+
+ list_for_each_entry(cur_fs, fs_uuids, list)
+ if (!memcmp(seed->fsid, cur_fs->fsid, BTRFS_FSID_SIZE))
+ return copy_fs_devices(copy, cur_fs);
+
+ return 1;
+}
+
+static int map_seed_devices(struct list_head *all_uuids,
+ char *search, int *found)
+{
+ struct btrfs_fs_devices *cur_fs, *cur_seed;
+ struct btrfs_fs_devices *fs_copy, *seed_copy;
+ struct btrfs_fs_devices *opened_fs;
+ struct btrfs_device *device;
+ struct btrfs_fs_info *fs_info;
+ struct list_head *fs_uuids;
+ int ret = 0;
+
+ fs_uuids = btrfs_scanned_uuids();
+
+ /*
+ * The fs_uuids list is global, and open_ctree_* will
+ * modify it, make a private copy here
+ */
+ list_for_each_entry(cur_fs, fs_uuids, list) {
+ /* don't bother handle all fs, if search target specified */
+ if (search) {
+ if (uuid_search(cur_fs, search) == 0)
+ continue;
+ *found = 1;
+ }
+
+ /* skip all fs already shown as mounted fs */
+ if (is_seen_fsid(cur_fs->fsid))
+ continue;
+
+ fs_copy = malloc(sizeof(*fs_copy));
+ if (!fs_copy) {
+ ret = -ENOMEM;
+ goto out;
+ }
+
+ ret = copy_fs_devices(fs_copy, cur_fs);
+ if (ret) {
+ free(fs_copy);
+ goto out;
+ }
+
+ list_add(&fs_copy->list, all_uuids);
+ }
+
+ list_for_each_entry(cur_fs, all_uuids, list) {
+ device = list_first_entry(&cur_fs->devices,
+ struct btrfs_device, dev_list);
+ if (!device)
+ continue;
+ /*
+ * open_ctree_* detects seed/sprout mapping
+ */
+ fs_info = open_ctree_fs_info(device->name, 0, 0,
+ OPEN_CTREE_PARTIAL);
+ if (!fs_info)
+ continue;
+
+ /*
+ * copy the seed chain under the opened fs
+ */
+ opened_fs = fs_info->fs_devices;
+ cur_seed = cur_fs;
+ while (opened_fs->seed) {
+ seed_copy = malloc(sizeof(*seed_copy));
+ if (!seed_copy) {
+ ret = -ENOMEM;
+ goto fail_out;
+ }
+ ret = find_and_copy_seed(opened_fs->seed, seed_copy,
+ fs_uuids);
+ if (ret) {
+ free(seed_copy);
+ goto fail_out;
+ }
+
+ cur_seed->seed = seed_copy;
+
+ opened_fs = opened_fs->seed;
+ cur_seed = cur_seed->seed;
+ }
+
+ close_ctree(fs_info->chunk_root);
+ }
+
+out:
+ return ret;
+fail_out:
+ close_ctree(fs_info->chunk_root);
+ goto out;
+}
+
static const char * const cmd_show_usage[] = {
- "btrfs filesystem show [options|<path>|<uuid>]",
+ "btrfs filesystem show [options] [<path>|<uuid>|<device>|label]",
"Show the structure of a filesystem",
"-d|--all-devices show only disks under /dev containing btrfs filesystem",
"-m|--mounted show only mounted btrfs",
static int cmd_show(int argc, char **argv)
{
- struct list_head *all_uuids;
+ LIST_HEAD(all_uuids);
struct btrfs_fs_devices *fs_devices;
- struct list_head *cur_uuid;
char *search = NULL;
int ret;
- int where = BTRFS_SCAN_LBLKID;
+ /* default, search both kernel and udev */
+ int where = -1;
int type = 0;
char mp[BTRFS_PATH_NAME_MAX + 1];
+ char path[PATH_MAX];
+ __u8 fsid[BTRFS_FSID_SIZE];
+ char uuid_buf[BTRFS_UUID_UNPARSED_SIZE];
+ int found = 0;
while (1) {
int long_index;
break;
switch (c) {
case 'd':
- where = BTRFS_SCAN_DEV;
+ where = BTRFS_SCAN_LBLKID;
break;
case 'm':
where = BTRFS_SCAN_MOUNTED;
}
}
- if (where == BTRFS_SCAN_LBLKID) {
- if (check_argc_max(argc, optind + 1))
- usage(cmd_show_usage);
- } else {
- if (check_argc_max(argc, optind))
- usage(cmd_show_usage);
- }
+ if (check_argc_max(argc, optind + 1))
+ usage(cmd_show_usage);
+
if (argc > optind) {
search = argv[optind];
- type = check_arg_type(search);
- if (type == BTRFS_ARG_UNKNOWN) {
- fprintf(stderr, "ERROR: arg type unknown\n");
+ if (strlen(search) == 0)
usage(cmd_show_usage);
- }
+ type = check_arg_type(search);
+ /*
+ * needs spl handling if input arg is block dev
+ * And if input arg is mount-point just print it
+ * right away
+ */
if (type == BTRFS_ARG_BLKDEV) {
- ret = get_btrfs_mount(search, mp, sizeof(mp));
- if (ret == 0)
- search = mp;
+ if (where == BTRFS_SCAN_LBLKID) {
+ /* we need to do this because
+ * legacy BTRFS_SCAN_DEV
+ * provides /dev/dm-x paths
+ */
+ if (realpath(search, path))
+ search = path;
+ } else {
+ ret = get_btrfs_mount(search,
+ mp, sizeof(mp));
+ if (!ret) {
+ /* given block dev is mounted*/
+ search = mp;
+ type = BTRFS_ARG_MNTPOINT;
+ } else {
+ ret = dev_to_fsid(search, fsid);
+ if (ret) {
+ fprintf(stderr,
+ "ERROR: No btrfs on %s\n",
+ search);
+ return 1;
+ }
+ uuid_unparse(fsid, uuid_buf);
+ search = uuid_buf;
+ type = BTRFS_ARG_UUID;
+ goto devs_only;
+ }
+ }
}
}
- if (where == BTRFS_SCAN_DEV)
+ if (where == BTRFS_SCAN_LBLKID)
goto devs_only;
/* show mounted btrfs */
- btrfs_scan_kernel(search);
+ ret = btrfs_scan_kernel(search);
+ if (search && !ret) {
+ /* since search is found we are done */
+ goto out;
+ }
/* shows mounted only */
if (where == BTRFS_SCAN_MOUNTED)
goto out;
devs_only:
- ret = scan_for_btrfs(where, !BTRFS_UPDATE_KERNEL);
+ ret = btrfs_scan_lblkid();
if (ret) {
fprintf(stderr, "ERROR: %d while scanning\n", ret);
return 1;
}
-
- all_uuids = btrfs_scanned_uuids();
- list_for_each(cur_uuid, all_uuids) {
- fs_devices = list_entry(cur_uuid, struct btrfs_fs_devices,
- list);
- if (search && uuid_search(fs_devices, search) == 0)
- continue;
- print_one_uuid(fs_devices);
+ /*
+ * scan_for_btrfs() don't build seed/sprout mapping,
+ * do mapping build for each scanned fs here
+ */
+ ret = map_seed_devices(&all_uuids, search, &found);
+ if (ret) {
+ fprintf(stderr,
+ "ERROR: %d while mapping seed devices\n", ret);
+ return 1;
}
+ list_for_each_entry(fs_devices, &all_uuids, list)
+ print_one_uuid(fs_devices);
+
+ if (search && !found)
+ ret = 1;
+
+ while (!list_empty(&all_uuids)) {
+ fs_devices = list_entry(all_uuids.next,
+ struct btrfs_fs_devices, list);
+ free_fs_devices(fs_devices);
+ }
out:
printf("%s\n", BTRFS_BUILD_VERSION);
- return 0;
+ free_seen_fsid();
+ return ret;
}
static const char * const cmd_sync_usage[] = {
fd = open_file_or_dir(path, &dirstream);
if (fd < 0) {
- fprintf(stderr, "ERROR: can't access to '%s'\n", path);
+ fprintf(stderr, "ERROR: can't access '%s'\n", path);
return 1;
}
int e = 0;
int fd = 0;
- if (typeflag == FTW_F) {
+ if ((typeflag == FTW_F) && S_ISREG(sb->st_mode)) {
if (defrag_global_verbose)
printf("%s\n", fpath);
fd = open(fpath, O_RDWR);
ret = do_defrag(fd, defrag_global_fancy_ioctl, &defrag_global_range);
e = errno;
close(fd);
- if (ret && e == ENOTTY) {
+ if (ret && e == ENOTTY && defrag_global_fancy_ioctl) {
fprintf(stderr, "ERROR: defrag range ioctl not "
"supported in this kernel, please try "
"without any options.\n");
defrag_global_range.flags |= BTRFS_DEFRAG_RANGE_START_IO;
for (i = optind; i < argc; i++) {
+ struct stat st;
+
dirstream = NULL;
fd = open_file_or_dir(argv[i], &dirstream);
if (fd < 0) {
close_file_or_dir(fd, dirstream);
continue;
}
+ if (fstat(fd, &st)) {
+ fprintf(stderr, "ERROR: failed to stat %s - %s\n",
+ argv[i], strerror(errno));
+ defrag_global_errors++;
+ close_file_or_dir(fd, dirstream);
+ continue;
+ }
+ if (!(S_ISDIR(st.st_mode) || S_ISREG(st.st_mode))) {
+ fprintf(stderr,
+ "ERROR: %s is not a directory or a regular file\n",
+ argv[i]);
+ defrag_global_errors++;
+ close_file_or_dir(fd, dirstream);
+ continue;
+ }
if (recursive) {
- struct stat st;
-
- if (fstat(fd, &st)) {
- fprintf(stderr, "ERROR: failed to stat %s - %s\n",
- argv[i], strerror(errno));
- defrag_global_errors++;
- close_file_or_dir(fd, dirstream);
- continue;
- }
if (S_ISDIR(st.st_mode)) {
ret = nftw(argv[i], defrag_callback, 10,
FTW_MOUNT | FTW_PHYS);
e = errno;
}
close_file_or_dir(fd, dirstream);
- if (ret && e == ENOTTY) {
+ if (ret && e == ENOTTY && defrag_global_fancy_ioctl) {
fprintf(stderr, "ERROR: defrag range ioctl not "
"supported in this kernel, please try "
"without any options.\n");
}
static const char * const cmd_resize_usage[] = {
- "btrfs filesystem resize [devid:][+/-]<newsize>[gkm]|[devid:]max <path>",
+ "btrfs filesystem resize [devid:][+/-]<newsize>[kKmMgGtTpPeE]|[devid:]max <path>",
"Resize a filesystem",
"If 'max' is passed, the filesystem will occupy all available space",
"on the device 'devid'.",
+ "[kK] means KiB, which denotes 1KiB = 1024B, 1MiB = 1024KiB, etc.",
NULL
};
fd = open_file_or_dir(path, &dirstream);
if (fd < 0) {
- fprintf(stderr, "ERROR: can't access to '%s'\n", path);
+ fprintf(stderr, "ERROR: can't access '%s'\n", path);
return 1;
}
if (check_argc_min(argc, 2) || check_argc_max(argc, 3))
usage(cmd_label_usage);
- if (argc > 2)
+ if (argc > 2) {
return set_label(argv[1], argv[2]);
- else
- return get_label(argv[1]);
+ } else {
+ char label[BTRFS_LABEL_SIZE];
+ int ret;
+
+ ret = get_label(argv[1], label);
+ if (!ret)
+ fprintf(stdout, "%s\n", label);
+
+ return ret;
+ }
}
const struct cmd_group filesystem_cmd_group = {