Commit 510193a2 authored May 12, 2012 by Mike Snitzer Committed by Alasdair G Kergon May 12, 2012

dm mpath: check if scsi_dh module already loaded before trying to load



If the requested scsi_dh module is already loaded then skip
request_module().

Multipath table loads can hang in an unnecessary __request_module.

Reported-by: Ben Marzinski <bmarzins@redhat.com>
Cc: stable@kernel.org
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>

parent 7cab8bf1

drivers/md/dm-mpath.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;