block/rnbd-srv: init ret with 0 instead of -EPERM
authorGuoqing Jiang <guoqing.jiang@linux.dev>
Wed, 24 May 2023 07:00:24 +0000 (15:00 +0800)
committerJens Axboe <axboe@kernel.dk>
Mon, 12 Jun 2023 01:48:42 +0000 (19:48 -0600)
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>
Link: https://lore.kernel.org/r/20230524070026.2932-7-guoqing.jiang@linux.dev
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/block/rnbd/rnbd-srv.c

index 300beb3..ac66a9b 100644 (file)
@@ -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: