diff options
author | Nikolay Borisov <nborisov@suse.com> | 2017-12-05 10:39:44 +0200 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2018-01-31 15:14:01 +0100 |
commit | 6eccbe81f1baf11e00d55bdf86827c632de4cc5f (patch) | |
tree | cf8c0762c085a56207aaaa7d1aea288b8cc91a86 | |
parent | 058fad5b921db273cf56bb34c4482ba99359ef59 (diff) |
btrfs-progs: Factor out common print_device_info
This function has been copied twice in chunk-recover and super-recover. Factor
it out into utils.c/h and use it. No functional changes.
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
-rw-r--r-- | chunk-recover.c | 18 | ||||
-rw-r--r-- | super-recover.c | 13 | ||||
-rw-r--r-- | utils.c | 18 | ||||
-rw-r--r-- | utils.h | 3 |
4 files changed, 21 insertions, 31 deletions
diff --git a/chunk-recover.c b/chunk-recover.c index 4a6d7141..705bcf52 100644 --- a/chunk-recover.c +++ b/chunk-recover.c @@ -451,24 +451,6 @@ static void print_device_extent_tree(struct device_extent_tree *tree) printf("\n"); } -static void print_device_info(struct btrfs_device *device, char *prefix) -{ - if (prefix) - printf("%s", prefix); - printf("Device: id = %llu, name = %s\n", - device->devid, device->name); -} - -static void print_all_devices(struct list_head *devices) -{ - struct btrfs_device *dev; - - printf("All Devices:\n"); - list_for_each_entry(dev, devices, dev_list) - print_device_info(dev, "\t"); - printf("\n"); -} - static void print_scan_result(struct recover_control *rc) { if (!rc->verbose) diff --git a/super-recover.c b/super-recover.c index 6b80416f..6a13d81b 100644 --- a/super-recover.c +++ b/super-recover.c @@ -186,19 +186,6 @@ static struct super_block_record *recover_get_good_super( return record; } -static void print_all_devices(struct list_head *devices) -{ - struct btrfs_device *dev; - - printf("All Devices:\n"); - list_for_each_entry(dev, devices, dev_list) { - printf("\t"); - printf("Device: id = %llu, name = %s\n", - dev->devid, dev->name); - } - printf("\n"); -} - static void print_super_info(struct super_block_record *record) { printf("\t\tdevice name = %s\n", record->device_name); @@ -2716,3 +2716,21 @@ unsigned long total_memory(void) } return si.totalram * si.mem_unit; /* bytes */ } + +void print_device_info(struct btrfs_device *device, char *prefix) +{ + if (prefix) + printf("%s", prefix); + printf("Device: id = %llu, name = %s\n", + device->devid, device->name); +} + +void print_all_devices(struct list_head *devices) +{ + struct btrfs_device *dev; + + printf("All Devices:\n"); + list_for_each_entry(dev, devices, dev_list) + print_device_info(dev, "\t"); + printf("\n"); +} @@ -173,6 +173,9 @@ int prefixcmp(const char *str, const char *prefix); unsigned long total_memory(void); +void print_device_info(struct btrfs_device *device, char *prefix); +void print_all_devices(struct list_head *devices); + /* * Global program state, configurable by command line and available to * functions without extra context passing. |