korg/btrfs-progs
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git synced 2024-11-15 00:04:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: add path opening helpers without dirstream

Browse Source 
For historical reasons the helpers [btrfs_]open_dir... return also
the 'DIR *dirstream' value when a directory is opened.

However this is never used. So avoid calling diropen() and return only
the fd.  This is a preparatory patch.

Signed-off-by: Goffredo Baroncelli <kreijack@libero.it>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Goffredo Baroncelli 2024-02-08 21:19:19 +01:00 committed by David Sterba
parent f5db48e053
commit efbe4ab8e2
2 changed files with 80 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
common/open-utils.c
View File

@ -317,4 +317,79 @@ void close_file_or_dir(int fd, DIR *dirstream)
errno = old_errno;
}
/*
* Open the given path and check if it's a btrfs filesystem.
*/
int btrfs_open_fd2(const char *path, bool verbose, bool read_write, bool dir_only)
{
struct statfs stfs;
struct stat st;
int ret;
if (stat(path, &st) != 0) {
error_on(verbose, "cannot access '%s': %m", path);
return -1;
}
if (dir_only && !S_ISDIR(st.st_mode)) {
error_on(verbose, "not a directory: %s", path);
return -3;
}
if (statfs(path, &stfs) != 0) {
error_on(verbose, "cannot access '%s': %m", path);
return -1;
}
if (stfs.f_type != BTRFS_SUPER_MAGIC) {
error_on(verbose, "not a btrfs filesystem: %s", path);
return -2;
}
if (S_ISDIR(st.st_mode) || !read_write)
ret = open(path, O_RDONLY);
else
ret = open(path, O_RDWR);
if (ret < 0) {
error_on(verbose, "cannot access '%s': %m", path);
}
return ret;
}
int btrfs_open_file_or_dir_fd(const char *path)
{
return btrfs_open_fd2(path, true, true, false);
}
int btrfs_open_dir_fd(const char *path)
{
return btrfs_open_fd2(path, true, true, true);
}
/*
* Given a path, return a file descriptor to the original path name or, if the
* pathname is a mounted btrfs device, to its mountpoint.
*
* On error, return -1, errno should be set.
*/
int btrfs_open_mnt_fd(const char *path, bool verbose)
{
char mp[PATH_MAX];
int ret;
if (path_is_block_device(path)) {
ret = get_btrfs_mount(path, mp, sizeof(mp));
if (ret < 0) {
error_on(verbose, "'%s' is not a mounted btrfs device", path);
errno = EINVAL;
return -1;
}
ret = btrfs_open_fd2(mp, verbose, true, true);
} else {
ret = btrfs_open_dir_fd(path);
}
return ret;
}

5
common/open-utils.h
View File

@ -39,4 +39,9 @@ int btrfs_open_file_or_dir(const char *path, DIR **dirstream, int verbose);
void close_file_or_dir(int fd, DIR *dirstream);
int btrfs_open_fd2(const char *path, bool verbose, bool read_write, bool dir_only);
int btrfs_open_file_or_dir_fd(const char *path);
int btrfs_open_dir_fd(const char *path);
int btrfs_open_mnt_fd(const char *path, bool verbose);
#endif