diff options
| author | Mike Snitzer <snitzer@redhat.com> | 2012-05-12 01:43:21 +0100 |
|---|---|---|
| committer | Alasdair G Kergon <agk@redhat.com> | 2012-05-12 01:43:21 +0100 |
| commit | 510193a2d3d2e03ae53b95c0ae4f33cdff02cbf8 (patch) | |
| tree | 7d1a5c7b9c8bb19fef2d28e6ec84c5f0e400be61 /drivers/md | |
| parent | 7cab8bf1601d38fd73a0a4ea40cc4892b26907cc (diff) | |
| download | linux-510193a2d3d2e03ae53b95c0ae4f33cdff02cbf8.tar.gz | |
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>
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/dm-mpath.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c index 922a3385eead..754f38f8a692 100644 --- a/drivers/md/dm-mpath.c +++ b/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; |