dm-mpath: don't print the "loaded" message if registering fails

[ Upstream commit 6e11952a6abc4641dc8ae63f01b318b31b44e8db ]

If dm_register_path_selector, don't print the "version X loaded" message.

Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/md/dm-ps-historical-service-time.c b/drivers/md/dm-ps-historical-service-time.c
index b49e10d76d03029b64750f9b4252b85b48e12853..2c8626a83de437bda77f8f5c985a76f403c021b5 100644 (file)
--- a/drivers/md/dm-ps-historical-service-time.c
+++ b/drivers/md/dm-ps-historical-service-time.c
@@ -541,8 +541,10 @@ static int __init dm_hst_init(void)
 {
        int r = dm_register_path_selector(&hst_ps);
 
-       if (r < 0)
+       if (r < 0) {
                DMERR("register failed %d", r);
+               return r;
+       }
 
        DMINFO("version " HST_VERSION " loaded");
 

diff --git a/drivers/md/dm-ps-queue-length.c b/drivers/md/dm-ps-queue-length.c
index e305f05ad1e5e804c663560383fe5ec74b3f4a87..eb543e6431e0381f023cf7539540d1fb1369889d 100644 (file)
--- a/drivers/md/dm-ps-queue-length.c
+++ b/drivers/md/dm-ps-queue-length.c
@@ -260,8 +260,10 @@ static int __init dm_ql_init(void)
 {
        int r = dm_register_path_selector(&ql_ps);
 
-       if (r < 0)
+       if (r < 0) {
                DMERR("register failed %d", r);
+               return r;
+       }
 
        DMINFO("version " QL_VERSION " loaded");
 

diff --git a/drivers/md/dm-ps-round-robin.c b/drivers/md/dm-ps-round-robin.c
index d1745b123dc19c2a16d194a5ea000a080de37e0d..66a15ac0c22c8b60f105f0620cb4c7b513f82b3d 100644 (file)
--- a/drivers/md/dm-ps-round-robin.c
+++ b/drivers/md/dm-ps-round-robin.c
@@ -220,8 +220,10 @@ static int __init dm_rr_init(void)
 {
        int r = dm_register_path_selector(&rr_ps);
 
-       if (r < 0)
+       if (r < 0) {
                DMERR("register failed %d", r);
+               return r;
+       }
 
        DMINFO("version " RR_VERSION " loaded");
 

diff --git a/drivers/md/dm-ps-service-time.c b/drivers/md/dm-ps-service-time.c
index 969d31c40272e25bf9b6712e50f6796a5e9b9d1f..f8c43aecdb27ad0ce58459301b51732abf740af2 100644 (file)
--- a/drivers/md/dm-ps-service-time.c
+++ b/drivers/md/dm-ps-service-time.c
@@ -341,8 +341,10 @@ static int __init dm_st_init(void)
 {
        int r = dm_register_path_selector(&st_ps);
 
-       if (r < 0)
+       if (r < 0) {
                DMERR("register failed %d", r);
+               return r;
+       }
 
        DMINFO("version " ST_VERSION " loaded");