diff options
author | Alasdair G Kergon <agk@redhat.com> | 2007-07-12 12:27:01 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-12 18:01:08 -0400 |
commit | 0cd3312434cd1f29bee6bff53bf2790d733ad2a2 (patch) | |
tree | fc833f871f1b4d320ee5ab365a3efb3e03b278db | |
parent | ac818646d4be79123ad8dc5f1c4da8575d4960f8 (diff) |
dm: remove duplicate module name from error msgs
Remove explicit module name from messages as the macro now includes it
automatically.
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/md/dm-mpath.c | 8 | ||||
-rw-r--r-- | drivers/md/dm-raid1.c | 5 | ||||
-rw-r--r-- | drivers/md/dm-round-robin.c | 2 |
3 files changed, 6 insertions, 9 deletions
diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c index c0950a0b5312..fc6c1021178d 100644 --- a/drivers/md/dm-mpath.c +++ b/drivers/md/dm-mpath.c | |||
@@ -1352,15 +1352,14 @@ static int __init dm_multipath_init(void) | |||
1352 | 1352 | ||
1353 | r = dm_register_target(&multipath_target); | 1353 | r = dm_register_target(&multipath_target); |
1354 | if (r < 0) { | 1354 | if (r < 0) { |
1355 | DMERR("%s: register failed %d", multipath_target.name, r); | 1355 | DMERR("register failed %d", r); |
1356 | kmem_cache_destroy(_mpio_cache); | 1356 | kmem_cache_destroy(_mpio_cache); |
1357 | return -EINVAL; | 1357 | return -EINVAL; |
1358 | } | 1358 | } |
1359 | 1359 | ||
1360 | kmultipathd = create_workqueue("kmpathd"); | 1360 | kmultipathd = create_workqueue("kmpathd"); |
1361 | if (!kmultipathd) { | 1361 | if (!kmultipathd) { |
1362 | DMERR("%s: failed to create workqueue kmpathd", | 1362 | DMERR("failed to create workqueue kmpathd"); |
1363 | multipath_target.name); | ||
1364 | dm_unregister_target(&multipath_target); | 1363 | dm_unregister_target(&multipath_target); |
1365 | kmem_cache_destroy(_mpio_cache); | 1364 | kmem_cache_destroy(_mpio_cache); |
1366 | return -ENOMEM; | 1365 | return -ENOMEM; |
@@ -1381,8 +1380,7 @@ static void __exit dm_multipath_exit(void) | |||
1381 | 1380 | ||
1382 | r = dm_unregister_target(&multipath_target); | 1381 | r = dm_unregister_target(&multipath_target); |
1383 | if (r < 0) | 1382 | if (r < 0) |
1384 | DMERR("%s: target unregister failed %d", | 1383 | DMERR("target unregister failed %d", r); |
1385 | multipath_target.name, r); | ||
1386 | kmem_cache_destroy(_mpio_cache); | 1384 | kmem_cache_destroy(_mpio_cache); |
1387 | } | 1385 | } |
1388 | 1386 | ||
diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c index ef124b71ccc8..2a02180f5d05 100644 --- a/drivers/md/dm-raid1.c +++ b/drivers/md/dm-raid1.c | |||
@@ -1335,8 +1335,7 @@ static int __init dm_mirror_init(void) | |||
1335 | 1335 | ||
1336 | r = dm_register_target(&mirror_target); | 1336 | r = dm_register_target(&mirror_target); |
1337 | if (r < 0) { | 1337 | if (r < 0) { |
1338 | DMERR("%s: Failed to register mirror target", | 1338 | DMERR("Failed to register mirror target"); |
1339 | mirror_target.name); | ||
1340 | dm_dirty_log_exit(); | 1339 | dm_dirty_log_exit(); |
1341 | } | 1340 | } |
1342 | 1341 | ||
@@ -1349,7 +1348,7 @@ static void __exit dm_mirror_exit(void) | |||
1349 | 1348 | ||
1350 | r = dm_unregister_target(&mirror_target); | 1349 | r = dm_unregister_target(&mirror_target); |
1351 | if (r < 0) | 1350 | if (r < 0) |
1352 | DMERR("%s: unregister failed %d", mirror_target.name, r); | 1351 | DMERR("unregister failed %d", r); |
1353 | 1352 | ||
1354 | dm_dirty_log_exit(); | 1353 | dm_dirty_log_exit(); |
1355 | } | 1354 | } |
diff --git a/drivers/md/dm-round-robin.c b/drivers/md/dm-round-robin.c index a348a97b65af..391dfa2ad434 100644 --- a/drivers/md/dm-round-robin.c +++ b/drivers/md/dm-round-robin.c | |||
@@ -205,7 +205,7 @@ static void __exit dm_rr_exit(void) | |||
205 | int r = dm_unregister_path_selector(&rr_ps); | 205 | int r = dm_unregister_path_selector(&rr_ps); |
206 | 206 | ||
207 | if (r < 0) | 207 | if (r < 0) |
208 | DMERR("round-robin: unregister failed %d", r); | 208 | DMERR("unregister failed %d", r); |
209 | } | 209 | } |
210 | 210 | ||
211 | module_init(dm_rr_init); | 211 | module_init(dm_rr_init); |