| Message ID | 1393242219-18525-3-git-send-email-Anand.Jain@oracle.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
diff --git a/utils.c b/utils.c index 231031e..bce92ab 100644 --- a/utils.c +++ b/utils.c @@ -1726,8 +1726,15 @@ int get_fs_info(char *path, struct btrfs_ioctl_fs_info_args *fi_args, ndevs++; } - BUG_ON(ndevs == 0); - ret = 0; + /* + * only when the only dev we wanted to find is not there then + * let any error be returned + */ + if (fi_args->num_devices != 1) { + BUG_ON(ndevs == 0); + ret = 0; + } + out: close_file_or_dir(fd, dirstream); return ret;
get_fs_info() provides the info of the specific device/devid, however when we delete the missing disk the super-block on the disk isn't cleared, and since btrfs-progs makes its decision by reading the disk super block, so it doesn't know about the kernel previous action, And now when we tried to probe kernel for the devid it fails. reproducer: $ mkfs.btrfs -d raid1 -m raid1 /dev/sde /dev/sdf $ modprobe -r btrfs && modprobe btrfs $ mount -o degraded /dev/sde /btrfs $ btrfs dev add /dev/sdd /btrfs $ btrfs dev del missing /btrfs $ btrfs scrub start -B /dev/sdf btrfs: utils.c:1741: get_fs_info: Assertion `!(ndevs == 0)' failed. Aborted (core dumped) Signed-off-by: Anand Jain <Anand.Jain@oracle.com> --- utils.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)