Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 59280
b: refs/heads/master
c: 0cd3312
h: refs/heads/master
v: v3
  • Loading branch information
Alasdair G Kergon authored and Linus Torvalds committed Jul 12, 2007
1 parent e6580ed commit 7b6f070
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ac818646d4be79123ad8dc5f1c4da8575d4960f8
refs/heads/master: 0cd3312434cd1f29bee6bff53bf2790d733ad2a2
8 changes: 3 additions & 5 deletions trunk/drivers/md/dm-mpath.c
Original file line number Diff line number Diff line change
Expand Up @@ -1352,15 +1352,14 @@ static int __init dm_multipath_init(void)

r = dm_register_target(&multipath_target);
if (r < 0) {
DMERR("%s: register failed %d", multipath_target.name, r);
DMERR("register failed %d", r);
kmem_cache_destroy(_mpio_cache);
return -EINVAL;
}

kmultipathd = create_workqueue("kmpathd");
if (!kmultipathd) {
DMERR("%s: failed to create workqueue kmpathd",
multipath_target.name);
DMERR("failed to create workqueue kmpathd");
dm_unregister_target(&multipath_target);
kmem_cache_destroy(_mpio_cache);
return -ENOMEM;
Expand All @@ -1381,8 +1380,7 @@ static void __exit dm_multipath_exit(void)

r = dm_unregister_target(&multipath_target);
if (r < 0)
DMERR("%s: target unregister failed %d",
multipath_target.name, r);
DMERR("target unregister failed %d", r);
kmem_cache_destroy(_mpio_cache);
}

Expand Down
5 changes: 2 additions & 3 deletions trunk/drivers/md/dm-raid1.c
Original file line number Diff line number Diff line change
Expand Up @@ -1335,8 +1335,7 @@ static int __init dm_mirror_init(void)

r = dm_register_target(&mirror_target);
if (r < 0) {
DMERR("%s: Failed to register mirror target",
mirror_target.name);
DMERR("Failed to register mirror target");
dm_dirty_log_exit();
}

Expand All @@ -1349,7 +1348,7 @@ static void __exit dm_mirror_exit(void)

r = dm_unregister_target(&mirror_target);
if (r < 0)
DMERR("%s: unregister failed %d", mirror_target.name, r);
DMERR("unregister failed %d", r);

dm_dirty_log_exit();
}
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/md/dm-round-robin.c
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ static void __exit dm_rr_exit(void)
int r = dm_unregister_path_selector(&rr_ps);

if (r < 0)
DMERR("round-robin: unregister failed %d", r);
DMERR("unregister failed %d", r);
}

module_init(dm_rr_init);
Expand Down

0 comments on commit 7b6f070

Please sign in to comment.