All of lore.kernel.org
 help / color / mirror / Atom feed
From: Guoqing Jiang <guoqing.jiang@linux.dev>
To: haris.iqbal@ionos.com, jinpu.wang@ionos.com, axboe@kernel.dk
Cc: linux-block@vger.kernel.org
Subject: [PATCH 08/10] block/rnbd-srv: init err earlier in rnbd_srv_init_module
Date: Tue, 23 May 2023 15:53:29 +0800	[thread overview]
Message-ID: <20230523075331.32250-9-guoqing.jiang@linux.dev> (raw)
In-Reply-To: <20230523075331.32250-1-guoqing.jiang@linux.dev>

With this, we can remove several lines of code.

Signed-off-by: Guoqing Jiang <guoqing.jiang@linux.dev>
---
 drivers/block/rnbd/rnbd-srv.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/block/rnbd/rnbd-srv.c b/drivers/block/rnbd/rnbd-srv.c
index 102831c302fc..1fdf3366135a 100644
--- a/drivers/block/rnbd/rnbd-srv.c
+++ b/drivers/block/rnbd/rnbd-srv.c
@@ -803,7 +803,7 @@ static struct rtrs_srv_ctx *rtrs_ctx;
 static struct rtrs_srv_ops rtrs_ops;
 static int __init rnbd_srv_init_module(void)
 {
-	int err;
+	int err = 0;
 
 	BUILD_BUG_ON(sizeof(struct rnbd_msg_hdr) != 4);
 	BUILD_BUG_ON(sizeof(struct rnbd_msg_sess_info) != 36);
@@ -817,19 +817,17 @@ static int __init rnbd_srv_init_module(void)
 	};
 	rtrs_ctx = rtrs_srv_open(&rtrs_ops, port_nr);
 	if (IS_ERR(rtrs_ctx)) {
-		err = PTR_ERR(rtrs_ctx);
 		pr_err("rtrs_srv_open(), err: %d\n", err);
-		return err;
+		return PTR_ERR(rtrs_ctx);
 	}
 
 	err = rnbd_srv_create_sysfs_files();
 	if (err) {
 		pr_err("rnbd_srv_create_sysfs_files(), err: %d\n", err);
 		rtrs_srv_close(rtrs_ctx);
-		return err;
 	}
 
-	return 0;
+	return err;
 }
 
 static void __exit rnbd_srv_cleanup_module(void)
-- 
2.35.3


  parent reply	other threads:[~2023-05-23  7:54 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-23  7:53 [PATCH 00/10] misc patches for rnbd Guoqing Jiang
2023-05-23  7:53 ` [PATCH 01/10] block/rnbd: kill rnbd_flags_supported Guoqing Jiang
2023-05-23  9:19   ` Jinpu Wang
2023-05-23  7:53 ` [PATCH 02/10] block/rnbd-srv: remove unused header Guoqing Jiang
2023-05-23  9:20   ` Jinpu Wang
2023-05-23  7:53 ` [PATCH 03/10] block/rnbd: introduce rnbd_access_modes Guoqing Jiang
2023-05-23  9:23   ` Jinpu Wang
2023-05-24  1:51     ` Guoqing Jiang
2023-05-23  7:53 ` [PATCH 04/10] block/rnbd-srv: no need to check sess_dev Guoqing Jiang
2023-05-23  9:27   ` Jinpu Wang
2023-05-24  1:35     ` Guoqing Jiang
2023-05-24  6:32       ` Jinpu Wang
2023-05-23  7:53 ` [PATCH 05/10] block/rnbd-srv: defer the allocation of rnbd_io_private Guoqing Jiang
2023-05-23  9:29   ` Jinpu Wang
2023-05-24  1:35     ` Guoqing Jiang
2023-05-23  7:53 ` [PATCH 06/10] block/rnbd-srv: rename one member in rnbd_srv_dev Guoqing Jiang
2023-05-23  9:30   ` Jinpu Wang
2023-05-23  7:53 ` [PATCH 07/10] block/rnbd-srv: init ret with 0 instead of -EPERM Guoqing Jiang
2023-05-23  9:30   ` Jinpu Wang
2023-05-23  7:53 ` Guoqing Jiang [this message]
2023-05-23  9:31   ` [PATCH 08/10] block/rnbd-srv: init err earlier in rnbd_srv_init_module Jinpu Wang
2023-05-23  7:53 ` [PATCH 09/10] block/rnbd-srv: make process_msg_sess_info returns void Guoqing Jiang
2023-05-23  9:32   ` Jinpu Wang
2023-05-23  7:53 ` [PATCH 10/10] block/rnbd: change device's name Guoqing Jiang
2023-05-23  9:18   ` Jinpu Wang
2023-05-23  9:20     ` Guoqing Jiang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230523075331.32250-9-guoqing.jiang@linux.dev \
    --to=guoqing.jiang@linux.dev \
    --cc=axboe@kernel.dk \
    --cc=haris.iqbal@ionos.com \
    --cc=jinpu.wang@ionos.com \
    --cc=linux-block@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.