we would need btrfs_scan_one_dir to san devs under /dev/mapper,
but /dev/mapper has links to the actual devs and current implementation
of btrfs_scan_one_dir skips links so it does not pick any
links under /dev/mapper. skipping links is fine when scanning whole of
/dev. But when we just want to scan /dev/mapper we want to avoid skipping
links otherwise we would be left with nothing.
This patch just adds the check if we are scanning devs
ONLY under /dev/mapper if when so it will not skip links
Thanks
Signed-off-by: Anand Jain <anand.jain@xxxxxxxxxx>
---
utils.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/utils.c b/utils.c
index 6b2344d..a329b7a 100644
--- a/utils.c
+++ b/utils.c
@@ -1018,6 +1018,7 @@ int btrfs_scan_one_dir(char *dirname, int run_ioctl)
struct list_head pending_list;
struct btrfs_fs_devices *tmp_devices;
u64 num_devices;
+ int skip_link = 1;
INIT_LIST_HEAD(&pending_list);
@@ -1026,6 +1027,9 @@ int btrfs_scan_one_dir(char *dirname, int run_ioctl)
return -ENOMEM;
strcpy(pending->name, dirname);
+ if (!strncmp(dirname, "/dev/mapper", strlen("/dev/mapper")))
+ skip_link = 0;
+
again:
dirname_len = strlen(pending->name);
fullpath = malloc(PATH_MAX);
@@ -1057,7 +1061,7 @@ again:
fprintf(stderr, "failed to stat %s\n", fullpath);
continue;
}
- if (S_ISLNK(st.st_mode))
+ if (skip_link && S_ISLNK(st.st_mode))
continue;
if (S_ISDIR(st.st_mode)) {
struct pending_dir *next = malloc(sizeof(*next));
@@ -1068,7 +1072,7 @@ again:
strcpy(next->name, fullpath);
list_add_tail(&next->list, &pending_list);
}
- if (!S_ISBLK(st.st_mode)) {
+ if (skip_link && !S_ISBLK(st.st_mode)) {
continue;
}
fd = open(fullpath, O_RDONLY);
--
1.8.1.227.g44fe835
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
