alex/bcachefs-tools
1
0
Fork 0
mirror of https://github.com/koverstreet/bcachefs-tools.git synced 2025-02-23 00:00:02 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fs_usage cmd fixes

Browse Source 
- Sort devices by device name if they don't have a label
- We were printing the wrong devices in the device list in the per-data
  entries
This commit is contained in:
Kent Overstreet 2020-01-03 19:10:00 -05:00
parent c07ac50dca
commit 7c39a1cf1b
2 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
cmd_fs.c
View File

@ -23,7 +23,7 @@ static void print_dev_usage(struct bchfs_handle fs,
unsigned i; unsigned i;
printf("\n"); printf("\n");
printf_pad(20, "%s (device %u):", d->label, d->idx); printf_pad(20, "%s (device %u):", d->label ?: "(no label)", d->idx);
printf("%24s%12s\n", d->dev ?: "(device not found)", bch2_dev_state[u.state]); printf("%24s%12s\n", d->dev ?: "(device not found)", bch2_dev_state[u.state]);
printf("%-20s%12s%12s%12s\n", printf("%-20s%12s%12s%12s\n",
@ -58,7 +58,11 @@ static int dev_by_label_cmp(const void *_l, const void *_r)
{ {
const struct dev_name *l = _l, *r = _r; const struct dev_name *l = _l, *r = _r;
return strcmp(l->label, r->label); return (l->label && r->label
? strcmp(l->label, r->label) : 0) ?:
(l->dev && r->dev
? strcmp(l->dev, r->dev) : 0) ?:
cmp_int(l->idx, r->idx);
} }
static void print_fs_usage(const char *path, enum units units) static void print_fs_usage(const char *path, enum units units)
@ -68,6 +72,7 @@ static void print_fs_usage(const char *path, enum units units)
struct bchfs_handle fs = bcache_fs_open(path); struct bchfs_handle fs = bcache_fs_open(path);
struct dev_name *dev;
dev_names dev_names = bchu_fs_get_devices(fs); dev_names dev_names = bchu_fs_get_devices(fs);
struct bch_ioctl_fs_usage *u = bchu_fs_usage(fs); struct bch_ioctl_fs_usage *u = bchu_fs_usage(fs);
@ -107,10 +112,18 @@ static void print_fs_usage(const char *path, enum units units)
*d++ = '['; *d++ = '[';
for (i = 0; i < r->r.nr_devs; i++) { for (i = 0; i < r->r.nr_devs; i++) {
unsigned dev_idx = r->r.devs[i];
if (i) if (i)
*d++ = ' '; *d++ = ' ';
strcpy(d, dev_names.item[r->r.devs[i]].dev);
d += strlen(dev_names.item[r->r.devs[i]].dev); darray_foreach(dev, dev_names)
if (dev->idx == dev_idx)
goto found;
d = NULL;
found:
d += dev && dev->dev
? sprintf(d, "%s", dev->dev)
: sprintf(d, "%u", dev_idx);
} }
*d++ = ']'; *d++ = ']';
*d++ = '\0'; *d++ = '\0';
@ -126,13 +139,12 @@ static void print_fs_usage(const char *path, enum units units)
sort(&darray_item(dev_names, 0), darray_size(dev_names), sort(&darray_item(dev_names, 0), darray_size(dev_names),
sizeof(darray_item(dev_names, 0)), dev_by_label_cmp, NULL); sizeof(darray_item(dev_names, 0)), dev_by_label_cmp, NULL);
struct dev_name *d; darray_foreach(dev, dev_names)
darray_foreach(d, dev_names) print_dev_usage(fs, dev, units);
print_dev_usage(fs, d, units);
darray_foreach(d, dev_names) { darray_foreach(dev, dev_names) {
free(d->dev); free(dev->dev);
free(d->label); free(dev->label);
} }
darray_free(dev_names); darray_free(dev_names);

4
tools-util.c
View File

@ -197,6 +197,10 @@ char *read_file_str(int dirfd, const char *path)
buf[len] = '\0'; buf[len] = '\0';
if (len && buf[len - 1] == '\n') if (len && buf[len - 1] == '\n')
buf[len - 1] = '\0'; buf[len - 1] = '\0';
if (!strlen(buf)) {
free(buf);
buf = NULL;
}
close(fd); close(fd);