marko10_000
/
btrfs-progs
forked from Mirrors/btrfs-progs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
master
Anand Jain 2013-12-27 13:56:29 +08:00 committed by Chris Mason
parent d894378932
commit 62d02453e4
1 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
utils.c
View File

@ -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) {