From dcc3df7e6d9467b61fb1dcce4bf653e835613e49 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Tue, 11 Nov 2014 12:35:58 +0100 Subject: 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 Signed-off-by: David Sterba --- cmds-device.c | 2 +- cmds-filesystem.c | 2 +- disk-io.c | 2 +- utils.c | 6 +++--- utils.h | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmds-device.c b/cmds-device.c index a939c56f..fa0830f2 100644 --- a/cmds-device.c +++ b/cmds-device.c @@ -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); diff --git a/cmds-filesystem.c b/cmds-filesystem.c index 0634c2bd..41623f31 100644 --- a/cmds-filesystem.c +++ b/cmds-filesystem.c @@ -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); diff --git a/disk-io.c b/disk-io.c index f24567b8..a5763007 100644 --- a/disk-io.c +++ b/disk-io.c @@ -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; } diff --git a/utils.c b/utils.c index 011e163d..3f54245b 100644 --- a/utils.c +++ b/utils.c @@ -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; diff --git a/utils.h b/utils.h index d382534f..1a2dbcd9 100644 --- a/utils.h +++ b/utils.h @@ -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, -- cgit v1.2.3