RepoMirrors
/
btrfs-progs
mirror of https://github.com/kdave/btrfs-progs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: drop _fd from btrfs_open_mnt_fd() 

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2024-02-20 12:56:24 +01:00
parent 590bcf20bf
commit 1669446fd9
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmds/device.c
View File

@ -752,7 +752,7 @@ static int cmd_device_stats(const struct cmd_struct *cmd, int argc, char **argv)
dev_path = argv[optind]; dev_path = argv[optind];
fdmnt = btrfs_open_mnt_fd(dev_path); fdmnt = btrfs_open_mnt(dev_path);
if (fdmnt < 0) if (fdmnt < 0)
return 1; return 1;

2
cmds/replace.c
View File

@ -183,7 +183,7 @@ static int cmd_replace_start(const struct cmd_struct *cmd,
return 1; return 1;
path = argv[optind + 2]; path = argv[optind + 2];
fdmnt = btrfs_open_mnt_fd(path); fdmnt = btrfs_open_mnt(path);
if (fdmnt < 0) if (fdmnt < 0)
goto leave_with_error; goto leave_with_error;

6
cmds/scrub.c
View File

@ -1322,7 +1322,7 @@ static int scrub_start(const struct cmd_struct *cmd, int argc, char **argv,
path = argv[optind]; path = argv[optind];
fdmnt = btrfs_open_mnt_fd(path); fdmnt = btrfs_open_mnt(path);
if (fdmnt < 0) if (fdmnt < 0)
return 1; return 1;
@ -1749,7 +1749,7 @@ static int cmd_scrub_cancel(const struct cmd_struct *cmd, int argc, char **argv)
path = argv[optind]; path = argv[optind];
fdmnt = btrfs_open_mnt_fd(path); fdmnt = btrfs_open_mnt(path);
if (fdmnt < 0) { if (fdmnt < 0) {
ret = 1; ret = 1;
goto out; goto out;
@ -1852,7 +1852,7 @@ static int cmd_scrub_status(const struct cmd_struct *cmd, int argc, char **argv)
path = argv[optind]; path = argv[optind];
fdmnt = btrfs_open_mnt_fd(path); fdmnt = btrfs_open_mnt(path);
if (fdmnt < 0) if (fdmnt < 0)
return 1; return 1;

2
common/open-utils.c
View File

@ -244,7 +244,7 @@ int btrfs_open_dir(const char *path)
* *
* Return the file descriptor or -errno. * Return the file descriptor or -errno.
*/ */
int btrfs_open_mnt_fd(const char *path) int btrfs_open_mnt(const char *path)
{ {
char mp[PATH_MAX]; char mp[PATH_MAX];
int ret; int ret;

2
common/open-utils.h
View File

@ -32,6 +32,6 @@ int get_btrfs_mount(const char *dev, char *mp, size_t mp_size);
int btrfs_open_fd2(const char *path, bool read_write, bool dir_only); int btrfs_open_fd2(const char *path, bool read_write, bool dir_only);
int btrfs_open_file_or_dir_fd(const char *path); int btrfs_open_file_or_dir_fd(const char *path);
int btrfs_open_dir(const char *path); int btrfs_open_dir(const char *path);
int btrfs_open_mnt_fd(const char *path); int btrfs_open_mnt(const char *path);
#endif #endif