diff options
author | Adrian Bunk <bunk@stusta.de> | 2006-06-26 03:27:42 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 12:58:37 -0400 |
commit | 5e56341d029f0c2cf31e78dc01d4c861ba4d6a5e (patch) | |
tree | e77087a31d3d1b86c563fb4461f07ee642de280b | |
parent | c93983bf517c100a31e40ef087e19bd3d7aa2d28 (diff) |
[PATCH] md: make md_print_devices() static
This patch makes the needlessly global md_print_devices() static.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | drivers/md/md.c | 7 | ||||
-rw-r--r-- | include/linux/raid/md.h | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index 2ce750d4be02..8c1e1900893d 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c | |||
@@ -73,6 +73,10 @@ static void autostart_arrays (int part); | |||
73 | static LIST_HEAD(pers_list); | 73 | static LIST_HEAD(pers_list); |
74 | static DEFINE_SPINLOCK(pers_lock); | 74 | static DEFINE_SPINLOCK(pers_lock); |
75 | 75 | ||
76 | static void md_print_devices(void); | ||
77 | |||
78 | #define MD_BUG(x...) { printk("md: bug in file %s, line %d\n", __FILE__, __LINE__); md_print_devices(); } | ||
79 | |||
76 | /* | 80 | /* |
77 | * Current RAID-1,4,5 parallel reconstruction 'guaranteed speed limit' | 81 | * Current RAID-1,4,5 parallel reconstruction 'guaranteed speed limit' |
78 | * is 1000 KB/sec, so the extra system load does not show up that much. | 82 | * is 1000 KB/sec, so the extra system load does not show up that much. |
@@ -1522,7 +1526,7 @@ static void print_rdev(mdk_rdev_t *rdev) | |||
1522 | printk(KERN_INFO "md: no rdev superblock!\n"); | 1526 | printk(KERN_INFO "md: no rdev superblock!\n"); |
1523 | } | 1527 | } |
1524 | 1528 | ||
1525 | void md_print_devices(void) | 1529 | static void md_print_devices(void) |
1526 | { | 1530 | { |
1527 | struct list_head *tmp, *tmp2; | 1531 | struct list_head *tmp, *tmp2; |
1528 | mdk_rdev_t *rdev; | 1532 | mdk_rdev_t *rdev; |
@@ -5345,7 +5349,6 @@ EXPORT_SYMBOL(md_write_end); | |||
5345 | EXPORT_SYMBOL(md_register_thread); | 5349 | EXPORT_SYMBOL(md_register_thread); |
5346 | EXPORT_SYMBOL(md_unregister_thread); | 5350 | EXPORT_SYMBOL(md_unregister_thread); |
5347 | EXPORT_SYMBOL(md_wakeup_thread); | 5351 | EXPORT_SYMBOL(md_wakeup_thread); |
5348 | EXPORT_SYMBOL(md_print_devices); | ||
5349 | EXPORT_SYMBOL(md_check_recovery); | 5352 | EXPORT_SYMBOL(md_check_recovery); |
5350 | MODULE_LICENSE("GPL"); | 5353 | MODULE_LICENSE("GPL"); |
5351 | MODULE_ALIAS("md"); | 5354 | MODULE_ALIAS("md"); |
diff --git a/include/linux/raid/md.h b/include/linux/raid/md.h index 66b44e5e0d6e..eb3e547c8fee 100644 --- a/include/linux/raid/md.h +++ b/include/linux/raid/md.h | |||
@@ -85,8 +85,6 @@ extern void md_done_sync(mddev_t *mddev, int blocks, int ok); | |||
85 | extern void md_error (mddev_t *mddev, mdk_rdev_t *rdev); | 85 | extern void md_error (mddev_t *mddev, mdk_rdev_t *rdev); |
86 | extern void md_unplug_mddev(mddev_t *mddev); | 86 | extern void md_unplug_mddev(mddev_t *mddev); |
87 | 87 | ||
88 | extern void md_print_devices (void); | ||
89 | |||
90 | extern void md_super_write(mddev_t *mddev, mdk_rdev_t *rdev, | 88 | extern void md_super_write(mddev_t *mddev, mdk_rdev_t *rdev, |
91 | sector_t sector, int size, struct page *page); | 89 | sector_t sector, int size, struct page *page); |
92 | extern void md_super_wait(mddev_t *mddev); | 90 | extern void md_super_wait(mddev_t *mddev); |
@@ -97,7 +95,5 @@ extern void md_new_event(mddev_t *mddev); | |||
97 | 95 | ||
98 | extern void md_update_sb(mddev_t * mddev); | 96 | extern void md_update_sb(mddev_t * mddev); |
99 | 97 | ||
100 | #define MD_BUG(x...) { printk("md: bug in file %s, line %d\n", __FILE__, __LINE__); md_print_devices(); } | ||
101 | |||
102 | #endif | 98 | #endif |
103 | 99 | ||