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

Fix bchu_fs_get_devices()

Browse Source
This commit is contained in:
Kent Overstreet 2019-12-27 14:04:16 -05:00
parent 7d2baabdb1
commit c58f66878f
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libbcachefs.c
View File

@ -1114,7 +1114,7 @@ dev_names bchu_fs_get_devices(struct bchfs_handle fs)
darray_init(devs); darray_init(devs);
while ((errno = 0), (d = readdir(dir))) { while ((errno = 0), (d = readdir(dir))) {
struct dev_name n; struct dev_name n = { 0, NULL, NULL };
if (sscanf(d->d_name, "dev-%u", &n.idx) != 1) if (sscanf(d->d_name, "dev-%u", &n.idx) != 1)
continue; continue;
@ -1122,9 +1122,12 @@ dev_names bchu_fs_get_devices(struct bchfs_handle fs)
char *block_attr = mprintf("dev-%u/block", n.idx); char *block_attr = mprintf("dev-%u/block", n.idx);
char sysfs_block_buf[4096]; char sysfs_block_buf[4096];
if (readlinkat(fs.sysfs_fd, block_attr, ssize_t r = readlinkat(fs.sysfs_fd, block_attr,
sysfs_block_buf, sizeof(sysfs_block_buf)) > 0) sysfs_block_buf, sizeof(sysfs_block_buf));
if (r > 0) {
sysfs_block_buf[r] = '\0';
n.dev = strdup(basename(sysfs_block_buf)); n.dev = strdup(basename(sysfs_block_buf));
}
free(block_attr); free(block_attr);