| Message ID | 1442306783-1288-2-git-send-email-anand.jain@oracle.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Tue, Sep 15, 2015 at 04:46:23PM +0800, Anand Jain wrote: > fsid can be mounted multiple times, with different subvolid. > And we don't have to scan a mount point if we already have > that in the scanned list. > > And thus nicely avoids the following warning with multiple > subvol mounts on older kernel like 2.6.32 where > BTRFS_IOC_GET_FSLABEL ioctl does not exist. > > ./btrfs fi show -m > Label: none uuid: 31845933-611e-422d-ae6f-386e57ad81aa > Total devices 2 FS bytes used 172.00KiB > devid 1 size 3.00GiB used 642.38MiB path /dev/sdd > devid 2 size 3.00GiB used 622.38MiB path /dev/sde > > warning, device 2 is missing > warning devid 2 not found already > warning, device 2 is missing > warning devid 2 not found already > > Signed-off-by: Anand Jain <anand.jain@oracle.com> Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/cmds-filesystem.c b/cmds-filesystem.c index 793df0e..e2049cc 100644 --- a/cmds-filesystem.c +++ b/cmds-filesystem.c @@ -468,6 +468,10 @@ static int btrfs_scan_kernel(void *search, unsigned unit_mode) goto out; } + /* skip all fs already shown as mounted fs */ + if (is_seen_fsid(fs_info_arg.fsid)) + continue; + ret = get_label_mounted(mnt->mnt_dir, label); /* provide backward kernel compatibility */ if (ret == -ENOTTY)
fsid can be mounted multiple times, with different subvolid. And we don't have to scan a mount point if we already have that in the scanned list. And thus nicely avoids the following warning with multiple subvol mounts on older kernel like 2.6.32 where BTRFS_IOC_GET_FSLABEL ioctl does not exist. ./btrfs fi show -m Label: none uuid: 31845933-611e-422d-ae6f-386e57ad81aa Total devices 2 FS bytes used 172.00KiB devid 1 size 3.00GiB used 642.38MiB path /dev/sdd devid 2 size 3.00GiB used 622.38MiB path /dev/sde warning, device 2 is missing warning devid 2 not found already warning, device 2 is missing warning devid 2 not found already Signed-off-by: Anand Jain <anand.jain@oracle.com> --- cmds-filesystem.c | 4 ++++ 1 file changed, 4 insertions(+)