summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--chunk-recover.c18
-rw-r--r--super-recover.c13
-rw-r--r--utils.c18
-rw-r--r--utils.h3
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);
diff --git a/utils.c b/utils.c
index 80071e23..3d0369f0 100644
--- a/utils.c
+++ b/utils.c
@@ -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");
+}
diff --git a/utils.h b/utils.h
index bd7484fd..b871c9ff 100644
--- a/utils.h
+++ b/utils.h
@@ -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.