Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Alasdair G Kergon and committed by
Linus Torvalds
0cd33124 ac818646

+6 -9
+3 -5
drivers/md/dm-mpath.c
··· 1352 1352 1353 1353 r = dm_register_target(&multipath_target); 1354 1354 if (r < 0) { 1355 - DMERR("%s: register failed %d", multipath_target.name, r); 1355 + DMERR("register failed %d", r); 1356 1356 kmem_cache_destroy(_mpio_cache); 1357 1357 return -EINVAL; 1358 1358 } 1359 1359 1360 1360 kmultipathd = create_workqueue("kmpathd"); 1361 1361 if (!kmultipathd) { 1362 - DMERR("%s: failed to create workqueue kmpathd", 1363 - multipath_target.name); 1362 + DMERR("failed to create workqueue kmpathd"); 1364 1363 dm_unregister_target(&multipath_target); 1365 1364 kmem_cache_destroy(_mpio_cache); 1366 1365 return -ENOMEM; ··· 1380 1381 1381 1382 r = dm_unregister_target(&multipath_target); 1382 1383 if (r < 0) 1383 - DMERR("%s: target unregister failed %d", 1384 - multipath_target.name, r); 1384 + DMERR("target unregister failed %d", r); 1385 1385 kmem_cache_destroy(_mpio_cache); 1386 1386 } 1387 1387
+2 -3
drivers/md/dm-raid1.c
··· 1335 1335 1336 1336 r = dm_register_target(&mirror_target); 1337 1337 if (r < 0) { 1338 - DMERR("%s: Failed to register mirror target", 1339 - mirror_target.name); 1338 + DMERR("Failed to register mirror target"); 1340 1339 dm_dirty_log_exit(); 1341 1340 } 1342 1341 ··· 1348 1349 1349 1350 r = dm_unregister_target(&mirror_target); 1350 1351 if (r < 0) 1351 - DMERR("%s: unregister failed %d", mirror_target.name, r); 1352 + DMERR("unregister failed %d", r); 1352 1353 1353 1354 dm_dirty_log_exit(); 1354 1355 }
+1 -1
drivers/md/dm-round-robin.c
··· 205 205 int r = dm_unregister_path_selector(&rr_ps); 206 206 207 207 if (r < 0) 208 - DMERR("round-robin: unregister failed %d", r); 208 + DMERR("unregister failed %d", r); 209 209 } 210 210 211 211 module_init(dm_rr_init);