---

yaml --- r: 300179 b: refs/heads/master c: 510193a h: refs/heads/master i: 300177: 85057b9 300175: d648f37 v: v3
git-mirror · May 12, 2012 · 1385ee0 · 1385ee0
1 parent 71c0488
commit 1385ee0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7cab8bf1601d38fd73a0a4ea40cc4892b26907cc
+refs/heads/master: 510193a2d3d2e03ae53b95c0ae4f33cdff02cbf8
diff --git a/trunk/drivers/md/dm-mpath.c b/trunk/drivers/md/dm-mpath.c
@@ -718,8 +718,8 @@ static int parse_hw_handler(struct dm_arg_set *as, struct multipath *m)
 		return 0;
 
 	m->hw_handler_name = kstrdup(dm_shift_arg(as), GFP_KERNEL);
-	request_module("scsi_dh_%s", m->hw_handler_name);
-	if (scsi_dh_handler_exist(m->hw_handler_name) == 0) {
+	if (!try_then_request_module(scsi_dh_handler_exist(m->hw_handler_name),
+				     "scsi_dh_%s", m->hw_handler_name)) {
 		ti->error = "unknown hardware handler type";
 		ret = -EINVAL;
 		goto fail;