btrfs-util: introduce btrfs_is_filesystem() and make use of it where appropriate
Let's unify the code that checks whether an fd is on btrfs a bit. (Also, rename btrfs_is_snapshot() to btrfs_is_subvol(), since that's usually how this is referred to in our code)
This commit is contained in:
parent
03091baac3
commit
21222ea5cd
|
@ -83,10 +83,22 @@ static int extract_subvolume_name(const char *path, const char **subvolume) {
|
|||
return 0;
|
||||
}
|
||||
|
||||
int btrfs_is_snapshot(int fd) {
|
||||
struct stat st;
|
||||
int btrfs_is_filesystem(int fd) {
|
||||
struct statfs sfs;
|
||||
|
||||
assert(fd >= 0);
|
||||
|
||||
if (fstatfs(fd, &sfs) < 0)
|
||||
return -errno;
|
||||
|
||||
return F_TYPE_EQUAL(sfs.f_type, BTRFS_SUPER_MAGIC);
|
||||
}
|
||||
|
||||
int btrfs_is_subvol(int fd) {
|
||||
struct stat st;
|
||||
|
||||
assert(fd >= 0);
|
||||
|
||||
/* On btrfs subvolumes always have the inode 256 */
|
||||
|
||||
if (fstat(fd, &st) < 0)
|
||||
|
@ -95,10 +107,7 @@ int btrfs_is_snapshot(int fd) {
|
|||
if (!S_ISDIR(st.st_mode) || st.st_ino != 256)
|
||||
return 0;
|
||||
|
||||
if (fstatfs(fd, &sfs) < 0)
|
||||
return -errno;
|
||||
|
||||
return F_TYPE_EQUAL(sfs.f_type, BTRFS_SUPER_MAGIC);
|
||||
return btrfs_is_filesystem(fd);
|
||||
}
|
||||
|
||||
int btrfs_subvol_make(const char *path) {
|
||||
|
@ -970,7 +979,7 @@ int btrfs_subvol_snapshot_fd(int old_fd, const char *new_path, BtrfsSnapshotFlag
|
|||
assert(old_fd >= 0);
|
||||
assert(new_path);
|
||||
|
||||
r = btrfs_is_snapshot(old_fd);
|
||||
r = btrfs_is_subvol(old_fd);
|
||||
if (r < 0)
|
||||
return r;
|
||||
if (r == 0) {
|
||||
|
|
|
@ -49,7 +49,8 @@ typedef enum BtrfsSnapshotFlags {
|
|||
BTRFS_SNAPSHOT_RECURSIVE = 4,
|
||||
} BtrfsSnapshotFlags;
|
||||
|
||||
int btrfs_is_snapshot(int fd);
|
||||
int btrfs_is_filesystem(int fd);
|
||||
int btrfs_is_subvol(int fd);
|
||||
|
||||
int btrfs_subvol_make(const char *path);
|
||||
int btrfs_subvol_make_label(const char *path);
|
||||
|
|
|
@ -136,12 +136,11 @@ static int image_make(
|
|||
|
||||
/* btrfs subvolumes have inode 256 */
|
||||
if (st.st_ino == 256) {
|
||||
struct statfs sfs;
|
||||
|
||||
if (fstatfs(fd, &sfs) < 0)
|
||||
return -errno;
|
||||
|
||||
if (F_TYPE_EQUAL(sfs.f_type, BTRFS_SUPER_MAGIC)) {
|
||||
r = btrfs_is_filesystem(fd);
|
||||
if (r < 0)
|
||||
return r;
|
||||
if (r) {
|
||||
BtrfsSubvolInfo info;
|
||||
BtrfsQuotaInfo quota;
|
||||
|
||||
|
|
Loading…
Reference in New Issue