diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-09-23 05:20:33 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-09-23 05:20:33 (GMT) |
commit | 739f1bcd045f473d79358aac94439722d41a2650 (patch) | |
tree | a8cfdff0a9b798acb618ba2b79861af723b217db /drivers/md/md.c | |
parent | 89f1c2c59c4aef8e26edbc7db5175e6ffb0e9ec7 (diff) | |
parent | 3bf6215a1b30db7df6083c708caab3fe1a8e8abe (diff) | |
download | linux-739f1bcd045f473d79358aac94439722d41a2650.tar.xz |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/md/md.c')
-rw-r--r-- | drivers/md/md.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index 67642ba..915e84d 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -7610,16 +7610,12 @@ EXPORT_SYMBOL(unregister_md_cluster_operations); int md_setup_cluster(struct mddev *mddev, int nodes) { - int err; - - err = request_module("md-cluster"); - if (err) { - pr_err("md-cluster module not found.\n"); - return -ENOENT; - } - + if (!md_cluster_ops) + request_module("md-cluster"); spin_lock(&pers_lock); + /* ensure module won't be unloaded */ if (!md_cluster_ops || !try_module_get(md_cluster_mod)) { + pr_err("can't find md-cluster module or get it's reference.\n"); spin_unlock(&pers_lock); return -ENOENT; } |