Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

rnbd-srv: remove rnbd_endio

Fold rnbd_endio into the only caller.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Acked-by: Jack Wang <jinpu.wang@ionos.com>
Link: https://lore.kernel.org/r/20220909131509.3263924-3-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

authored by

Christoph Hellwig and committed by
Jens Axboe
2ecaa581 9ad15320

+7 -15
-2
drivers/block/rnbd/rnbd-srv-dev.h
··· 29 29 */ 30 30 void rnbd_dev_close(struct rnbd_dev *dev); 31 31 32 - void rnbd_endio(void *priv, int error); 33 - 34 32 #endif /* RNBD_SRV_DEV_H */
+7 -13
drivers/block/rnbd/rnbd-srv.c
··· 85 85 kref_put(&sess_dev->kref, rnbd_sess_dev_release); 86 86 } 87 87 88 - void rnbd_endio(void *priv, int error) 89 - { 90 - struct rnbd_io_private *rnbd_priv = priv; 91 - struct rnbd_srv_sess_dev *sess_dev = rnbd_priv->sess_dev; 92 - 93 - rnbd_put_sess_dev(sess_dev); 94 - 95 - rtrs_srv_resp_rdma(rnbd_priv->id, error); 96 - 97 - kfree(priv); 98 - } 99 - 100 88 static struct rnbd_srv_sess_dev * 101 89 rnbd_get_sess_dev(int dev_id, struct rnbd_srv_session *srv_sess) 102 90 { ··· 105 117 106 118 static void rnbd_dev_bi_end_io(struct bio *bio) 107 119 { 108 - rnbd_endio(bio->bi_private, blk_status_to_errno(bio->bi_status)); 120 + struct rnbd_io_private *rnbd_priv = bio->bi_private; 121 + struct rnbd_srv_sess_dev *sess_dev = rnbd_priv->sess_dev; 122 + 123 + rnbd_put_sess_dev(sess_dev); 124 + rtrs_srv_resp_rdma(rnbd_priv->id, blk_status_to_errno(bio->bi_status)); 125 + 126 + kfree(rnbd_priv); 109 127 bio_put(bio); 110 128 } 111 129