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 08:14:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: path-utils: rename is_existing_blk_or_reg_file

Browse Source 
Rename and add path_ prefix.

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2019-07-02 00:09:21 +02:00
parent 116e27a87a
commit fc86737f91
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/path-utils.c
View File

@ -263,7 +263,7 @@ int is_same_loop_file(const char *a, const char *b)
} }
/* Checks if a file exists and is a block or regular file*/ /* Checks if a file exists and is a block or regular file*/
int is_existing_blk_or_reg_file(const char *filename) int path_is_reg_or_block_device(const char *filename)
{ {
struct stat st_buf; struct stat st_buf;

2
common/path-utils.h
View File

@ -33,7 +33,7 @@ int path_is_mount_point(const char *file);
int path_exists(const char *file); int path_exists(const char *file);
int path_is_reg_file(const char *path); int path_is_reg_file(const char *path);
int is_same_loop_file(const char *a, const char *b); int is_same_loop_file(const char *a, const char *b);
int is_existing_blk_or_reg_file(const char *filename); int path_is_reg_or_block_device(const char *filename);
int test_issubvolname(const char *name); int test_issubvolname(const char *name);
int test_isdir(const char *path); int test_isdir(const char *path);

6
common/utils.c
View File

@ -647,7 +647,7 @@ int check_mounted_where(int fd, const char *file, char *where, int size,
} else { } else {
/* ignore entries in the mount table that are not /* ignore entries in the mount table that are not
associated with a file*/ associated with a file*/
if((ret = is_existing_blk_or_reg_file(mnt->mnt_fsname)) < 0) if((ret = path_is_reg_or_block_device(mnt->mnt_fsname)) < 0)
goto out_mntloop_err; goto out_mntloop_err;
else if(!ret) else if(!ret)
continue; continue;
@ -1036,7 +1036,7 @@ int get_label(const char *btrfs_dev, char *label)
{ {
int ret; int ret;
ret = is_existing_blk_or_reg_file(btrfs_dev); ret = path_is_reg_or_block_device(btrfs_dev);
if (!ret) if (!ret)
ret = get_label_mounted(btrfs_dev, label); ret = get_label_mounted(btrfs_dev, label);
else if (ret > 0) else if (ret > 0)
@ -1052,7 +1052,7 @@ int set_label(const char *btrfs_dev, const char *label)
if (check_label(label)) if (check_label(label))
return -1; return -1;
ret = is_existing_blk_or_reg_file(btrfs_dev); ret = path_is_reg_or_block_device(btrfs_dev);
if (!ret) if (!ret)
ret = set_label_mounted(btrfs_dev, label); ret = set_label_mounted(btrfs_dev, label);
else if (ret > 0) else if (ret > 0)