btrfs-progs: test_skip_this_disk() isn't needed anymore

add_seen_fsid() which was introduced lately will eliminate
the mounted disks, so we don't need test_skip_this_disk()
anymore

Signed-off-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <clm@fb.com>

diff --git a/utils.c b/utils.c
index ad78a7f..75b37f3 100644 (file)
--- a/utils.c
+++ b/utils.c
@@ -1967,21 +1967,6 @@ int test_dev_for_mkfs(char *file, int force_overwrite, char *estr)
        return 0;
 }
 
-static int test_skip_this_disk(char *path)
-{
-       int fd;
-
-       /*
-        * this will eliminate disks which are mounted (btrfs)
-        * and non-dm disk path when dm is enabled
-        */
-       fd = open(path, O_RDWR|O_EXCL);
-       if (fd < 0)
-               return 1;
-       close(fd);
-       return 0;
-}
-
 int btrfs_scan_lblkid(int update_kernel)
 {
        int fd = -1;
@@ -2006,8 +1991,6 @@ int btrfs_scan_lblkid(int update_kernel)
                        continue;
                /* if we are here its definitely a btrfs disk*/
                strncpy(path, blkid_dev_devname(dev), PATH_MAX);
-               if (test_skip_this_disk(path))
-                       continue;
 
                fd = open(path, O_RDONLY);
                if (fd < 0) {