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 V2 6/8] block/rnbd-srv: init ret with 0 instead of -EPERM
Date: Wed, 24 May 2023 15:00:24 +0800 [thread overview]
Message-ID: <20230524070026.2932-7-guoqing.jiang@linux.dev> (raw)
In-Reply-To: <20230524070026.2932-1-guoqing.jiang@linux.dev>
Let's always set errno after pr_err which is consistent with
default case.
Acked-by: Jack Wang <jinpu.wang@ionos.com>
Signed-off-by: Guoqing Jiang <guoqing.jiang@linux.dev>
---
drivers/block/rnbd/rnbd-srv.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/block/rnbd/rnbd-srv.c b/drivers/block/rnbd/rnbd-srv.c
index ac2dc692bdc0..a9a506f4f33f 100644
--- a/drivers/block/rnbd/rnbd-srv.c
+++ b/drivers/block/rnbd/rnbd-srv.c
@@ -467,34 +467,33 @@ static int rnbd_srv_check_update_open_perm(struct rnbd_srv_dev *srv_dev,
struct rnbd_srv_session *srv_sess,
enum rnbd_access_mode access_mode)
{
- int ret = -EPERM;
+ int ret = 0;
mutex_lock(&srv_dev->lock);
switch (access_mode) {
case RNBD_ACCESS_RO:
- ret = 0;
break;
case RNBD_ACCESS_RW:
if (srv_dev->open_write_cnt == 0) {
srv_dev->open_write_cnt++;
- ret = 0;
} else {
pr_err("Mapping device '%s' for session %s with RW permissions failed. Device already opened as 'RW' by %d client(s), access mode %s.\n",
srv_dev->name, srv_sess->sessname,
srv_dev->open_write_cnt,
rnbd_access_modes[access_mode].str);
+ ret = -EPERM;
}
break;
case RNBD_ACCESS_MIGRATION:
if (srv_dev->open_write_cnt < 2) {
srv_dev->open_write_cnt++;
- ret = 0;
} else {
pr_err("Mapping device '%s' for session %s with migration permissions failed. Device already opened as 'RW' by %d client(s), access mode %s.\n",
srv_dev->name, srv_sess->sessname,
srv_dev->open_write_cnt,
rnbd_access_modes[access_mode].str);
+ ret = -EPERM;
}
break;
default:
--
2.35.3
next prev parent reply other threads:[~2023-05-24 7:01 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-24 7:00 [PATCH V2 0/8] misc patches for rnbd Guoqing Jiang
2023-05-24 7:00 ` [PATCH V2 1/8] block/rnbd: kill rnbd_flags_supported Guoqing Jiang
2023-05-24 7:00 ` [PATCH V2 2/8] block/rnbd-srv: remove unused header Guoqing Jiang
2023-05-24 7:00 ` [PATCH V2 3/8] block/rnbd: introduce rnbd_access_modes Guoqing Jiang
2023-05-24 10:46 ` Jinpu Wang
2023-05-24 7:00 ` [PATCH V2 4/8] block/rnbd-srv: no need to check sess_dev Guoqing Jiang
2023-05-24 7:00 ` [PATCH V2 5/8] block/rnbd-srv: rename one member in rnbd_srv_dev Guoqing Jiang
2023-05-24 7:00 ` Guoqing Jiang [this message]
2023-05-24 7:00 ` [PATCH V2 7/8] block/rnbd-srv: init err earlier in rnbd_srv_init_module Guoqing Jiang
2023-05-24 7:00 ` [PATCH V2 8/8] block/rnbd-srv: make process_msg_sess_info returns void Guoqing Jiang
2023-06-12 1:37 ` [PATCH V2 0/8] misc patches for rnbd Guoqing Jiang
2023-06-12 1:49 ` Jens Axboe
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=20230524070026.2932-7-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox