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

btrfs-progs: rename btrfs_scan_lblkid() to btrfs_scan_devices() 

It seems like bad idea to use a library name (lblkid) within generic
function name. The currently used scanning library is implementation
detail and this detail should be hidden for rest of the code.

Signed-off-by: Karel Zak <kzak@redhat.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
master
Karel Zak 2014-11-11 12:35:58 +01:00 committed by David Sterba
parent cf8fd1a708
commit dcc3df7e6d
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

@ -283,7 +283,7 @@ static int cmd_device_scan(int argc, char **argv)
if (all || argc - optind == 0) {
printf("Scanning for Btrfs filesystems\n");
ret = btrfs_scan_lblkid();
ret = btrfs_scan_devices();
error_on(ret, "error %d while scanning", ret);
ret = btrfs_register_all_devices();
error_on(ret, "there are %d errors while registering devices", ret);

2
cmds-filesystem.c
View File

@ -872,7 +872,7 @@ static int cmd_filesystem_show(int argc, char **argv)
goto out;
devs_only:
ret = btrfs_scan_lblkid();
ret = btrfs_scan_devices();
if (ret) {
error("blkid device scan returned %d\n", ret);

2
disk-io.c
View File

@ -1167,7 +1167,7 @@ int btrfs_scan_fs_devices(int fd, const char *path,
}
if (!skip_devices && total_devs != 1) {
ret = btrfs_scan_lblkid();
ret = btrfs_scan_devices();
if (ret)
return ret;
}

6
utils.c
View File

@ -2384,7 +2384,7 @@ int check_mounted_where(int fd, const char *file, char *where, int size,
/* scan other devices */
if (is_btrfs && total_devs > 1) {
ret = btrfs_scan_lblkid();
ret = btrfs_scan_devices();
if (ret)
return ret;
}
@ -2464,7 +2464,7 @@ int btrfs_register_one_device(const char *fname)
/*
* Register all devices in the fs_uuid list created in the user
* space. Ensure btrfs_scan_lblkid() is called before this func.
* space. Ensure btrfs_scan_devices() is called before this func.
*/
int btrfs_register_all_devices(void)
{
@ -3503,7 +3503,7 @@ int test_dev_for_mkfs(const char *file, int force_overwrite)
return 0;
}
int btrfs_scan_lblkid(void)
int btrfs_scan_devices(void)
{
int fd = -1;
int ret;

2
utils.h
View File

@ -210,7 +210,7 @@ int csum_tree_block(struct btrfs_root *root, struct extent_buffer *buf,
int verify);
int ask_user(const char *question);
int lookup_ino_rootid(int fd, u64 *rootid);
int btrfs_scan_lblkid(void);
int btrfs_scan_devices(void);
int get_btrfs_mount(const char *dev, char *mp, size_t mp_size);
int find_mount_root(const char *path, char **mount_root);
int get_device_info(int fd, u64 devid,