Commit 2ecaa581 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

rnbd-srv: remove rnbd_endio 



Fold rnbd_endio into the only caller.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Acked-by: default avatarJack Wang <jinpu.wang@ionos.com>
Link: https://lore.kernel.org/r/20220909131509.3263924-3-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 9ad15320

drivers/block/rnbd/rnbd-srv-dev.h

+0 −2
Original line number Diff line number Diff line
@@ -29,6 +29,4 @@ struct rnbd_dev *rnbd_dev_open(const char *path, fmode_t flags); 
 */

void rnbd_dev_close(struct rnbd_dev *dev);



void rnbd_endio(void *priv, int error);



#endif /* RNBD_SRV_DEV_H */

drivers/block/rnbd/rnbd-srv.c

+7 −13
Original line number Diff line number Diff line
@@ -85,18 +85,6 @@ static inline void rnbd_put_sess_dev(struct rnbd_srv_sess_dev *sess_dev) 
	kref_put(&sess_dev->kref, rnbd_sess_dev_release);

}



void rnbd_endio(void *priv, int error)

{

	struct rnbd_io_private *rnbd_priv = priv;

	struct rnbd_srv_sess_dev *sess_dev = rnbd_priv->sess_dev;



	rnbd_put_sess_dev(sess_dev);



	rtrs_srv_resp_rdma(rnbd_priv->id, error);



	kfree(priv);

}



static struct rnbd_srv_sess_dev *

rnbd_get_sess_dev(int dev_id, struct rnbd_srv_session *srv_sess)

{
@@ -117,7 +105,13 @@ rnbd_get_sess_dev(int dev_id, struct rnbd_srv_session *srv_sess) 


static void rnbd_dev_bi_end_io(struct bio *bio)

{

	rnbd_endio(bio->bi_private, blk_status_to_errno(bio->bi_status));

	struct rnbd_io_private *rnbd_priv = bio->bi_private;

	struct rnbd_srv_sess_dev *sess_dev = rnbd_priv->sess_dev;



	rnbd_put_sess_dev(sess_dev);

	rtrs_srv_resp_rdma(rnbd_priv->id, blk_status_to_errno(bio->bi_status));



	kfree(rnbd_priv);

	bio_put(bio);

}