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 1d82c95d323d892ea68a048b6cb6aec7806275db..d0d1f97d21b6e9ecc027ae50b33489e1a09c0f5a 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 6fbec9fc242d9a9ed1d4597231eb6c29db6c246c..8e298570c8d243bbdbb7b923857cb2b3d9bdcb58 100644 (file)
--- a/drivers/md/dm-ps-queue-length.c
+++ b/drivers/md/dm-ps-queue-length.c
@@ -259,8 +259,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 1d07392b5ed4879f4c4ba0679568c627e65688d5..22c68ca81a248359a0e346c8420329480781a08a 100644 (file)
--- a/drivers/md/dm-ps-round-robin.c
+++ b/drivers/md/dm-ps-round-robin.c
@@ -216,8 +216,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 eba2293be68645983ca0e71061934edb45a8982d..d1e77eefaf2b5c527ee564e3eed4411444b6ebf4 100644 (file)
--- a/drivers/md/dm-ps-service-time.c
+++ b/drivers/md/dm-ps-service-time.c
@@ -340,8 +340,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");