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

btrfs-progs: remove duplicate function __is_subvol() 

The function test_issubvolume() provides the same check, and
has better logic.

Signed-off-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.com>
master
Anand Jain 2016-03-21 15:21:02 +08:00 committed by David Sterba
parent a5dbd2064e
commit 0f9a5cf70c
1 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
utils.c
View File

@ -1866,25 +1866,6 @@ int set_label(const char *btrfs_dev, const char *label)
return ret;
}
/*
* Unsafe subvolume check.
*
* This only checks ino == BTRFS_FIRST_FREE_OBJECTID, even it is not in a
* btrfs mount point.
* Must use together with other reliable method like btrfs ioctl.
*/
static int __is_subvol(const char *path)
{
struct stat st;
int ret;
ret = lstat(path, &st);
if (ret < 0)
return ret;
return st.st_ino == BTRFS_FIRST_FREE_OBJECTID;
}
/*
* A not-so-good version fls64. No fascinating optimization since
* no one except parse_size use it
@ -2005,7 +1986,7 @@ u64 parse_qgroupid(const char *p)
path:
/* Path format like subv at 'my_subvol' is the fallback case */
ret = __is_subvol(p);
ret = test_issubvolume(p);
if (ret < 0 || !ret)
goto err;
fd = open(p, O_RDONLY);