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

btrfs-progs: move get_fsid() to utils.c 

Make get_fsid() to a common functions.
This will be used for 'subvol delete --commit-after'.

Signed-off-by: Tomohiro Misono <misono.tomohiro@jp.fujitsu.com>
Reviewed-by: Qu Wenruo <quwenruo.btrfs@gmx.com>
Signed-off-by: David Sterba <dsterba@suse.com>
master
Misono, Tomohiro 2017-09-27 11:01:43 +09:00 committed by David Sterba
parent 75716f6a8f
commit 448763c64a
3 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
cmds-property.c
View File

@ -48,36 +48,6 @@ static int parse_prop(const char *arg, const struct prop_handler *props,
return -1;
}
static int get_fsid(const char *path, u8 *fsid, int silent)
{
int ret;
int fd;
struct btrfs_ioctl_fs_info_args args;
fd = open(path, O_RDONLY);
if (fd < 0) {
ret = -errno;
if (!silent)
error("failed to open %s: %s", path,
strerror(-ret));
goto out;
}
ret = ioctl(fd, BTRFS_IOC_FS_INFO, &args);
if (ret < 0) {
ret = -errno;
goto out;
}
memcpy(fsid, args.fsid, BTRFS_FSID_SIZE);
ret = 0;
out:
if (fd != -1)
close(fd);
return ret;
}
static int check_btrfs_object(const char *object)
{
int ret;

30
utils.c
View File

@ -1758,6 +1758,36 @@ out:
return ret;
}
int get_fsid(const char *path, u8 *fsid, int silent)
{
int ret;
int fd;
struct btrfs_ioctl_fs_info_args args;
fd = open(path, O_RDONLY);
if (fd < 0) {
ret = -errno;
if (!silent)
error("failed to open %s: %s", path,
strerror(-ret));
goto out;
}
ret = ioctl(fd, BTRFS_IOC_FS_INFO, &args);
if (ret < 0) {
ret = -errno;
goto out;
}
memcpy(fsid, args.fsid, BTRFS_FSID_SIZE);
ret = 0;
out:
if (fd != -1)
close(fd);
return ret;
}
static int group_profile_devs_min(u64 flag)
{
switch (flag & BTRFS_BLOCK_GROUP_PROFILE_MASK) {

1
utils.h
View File

@ -100,6 +100,7 @@ int open_file_or_dir3(const char *fname, DIR **dirstream, int open_flags);
void close_file_or_dir(int fd, DIR *dirstream);
int get_fs_info(const char *path, struct btrfs_ioctl_fs_info_args *fi_args,
struct btrfs_ioctl_dev_info_args **di_ret);
int get_fsid(const char *path, u8 *fsid, int silent);
int get_label(const char *btrfs_dev, char *label);
int set_label(const char *btrfs_dev, const char *label);