rnbd-srv: simplify rnbd_srv_fill_msg_open_rsp

Remove all the wrappers and just get the information directly from
the block device, or where no such helpers exist the request_queue.

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-2-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/block/rnbd/rnbd-srv-dev.h b/drivers/block/rnbd/rnbd-srv-dev.h
index 8407d12f70afee6f61c0a5e9255830d8501a03c7..8eeb3d607e7b5f30367ec7d9e11d4614fc8201bc 100644 (file)
--- a/drivers/block/rnbd/rnbd-srv-dev.h
+++ b/drivers/block/rnbd/rnbd-srv-dev.h
@@ -31,34 +31,4 @@ void rnbd_dev_close(struct rnbd_dev *dev);
 
 void rnbd_endio(void *priv, int error);
 
-static inline int rnbd_dev_get_max_segs(const struct rnbd_dev *dev)
-{
-       return queue_max_segments(bdev_get_queue(dev->bdev));
-}
-
-static inline int rnbd_dev_get_max_hw_sects(const struct rnbd_dev *dev)
-{
-       return queue_max_hw_sectors(bdev_get_queue(dev->bdev));
-}
-
-static inline int rnbd_dev_get_secure_discard(const struct rnbd_dev *dev)
-{
-       return bdev_max_secure_erase_sectors(dev->bdev);
-}
-
-static inline int rnbd_dev_get_max_discard_sects(const struct rnbd_dev *dev)
-{
-       return bdev_max_discard_sectors(dev->bdev);
-}
-
-static inline int rnbd_dev_get_discard_granularity(const struct rnbd_dev *dev)
-{
-       return bdev_get_queue(dev->bdev)->limits.discard_granularity;
-}
-
-static inline int rnbd_dev_get_discard_alignment(const struct rnbd_dev *dev)
-{
-       return bdev_discard_alignment(dev->bdev);
-}
-
 #endif /* RNBD_SRV_DEV_H */

diff --git a/drivers/block/rnbd/rnbd-srv.c b/drivers/block/rnbd/rnbd-srv.c
index 8d011652a15c26d2308e31eb8c08cad073727323..735d3f8d923e4a7a209a6682832fe39f1cc92333 100644 (file)
--- a/drivers/block/rnbd/rnbd-srv.c
+++ b/drivers/block/rnbd/rnbd-srv.c
@@ -544,34 +544,25 @@ rnbd_srv_get_or_create_srv_dev(struct rnbd_dev *rnbd_dev,
 static void rnbd_srv_fill_msg_open_rsp(struct rnbd_msg_open_rsp *rsp,
                                        struct rnbd_srv_sess_dev *sess_dev)
 {
-       struct rnbd_dev *rnbd_dev = sess_dev->rnbd_dev;
+       struct block_device *bdev = sess_dev->rnbd_dev->bdev;
 
        rsp->hdr.type = cpu_to_le16(RNBD_MSG_OPEN_RSP);
-       rsp->device_id =
-               cpu_to_le32(sess_dev->device_id);
-       rsp->nsectors =
-               cpu_to_le64(get_capacity(rnbd_dev->bdev->bd_disk));
-       rsp->logical_block_size =
-               cpu_to_le16(bdev_logical_block_size(rnbd_dev->bdev));
-       rsp->physical_block_size =
-               cpu_to_le16(bdev_physical_block_size(rnbd_dev->bdev));
-       rsp->max_segments =
-               cpu_to_le16(rnbd_dev_get_max_segs(rnbd_dev));
+       rsp->device_id = cpu_to_le32(sess_dev->device_id);
+       rsp->nsectors = cpu_to_le64(bdev_nr_sectors(bdev));
+       rsp->logical_block_size = cpu_to_le16(bdev_logical_block_size(bdev));
+       rsp->physical_block_size = cpu_to_le16(bdev_physical_block_size(bdev));
+       rsp->max_segments = cpu_to_le16(bdev_max_segments(bdev));
        rsp->max_hw_sectors =
-               cpu_to_le32(rnbd_dev_get_max_hw_sects(rnbd_dev));
+               cpu_to_le32(queue_max_hw_sectors(bdev_get_queue(bdev)));
        rsp->max_write_same_sectors = 0;
-       rsp->max_discard_sectors =
-               cpu_to_le32(rnbd_dev_get_max_discard_sects(rnbd_dev));
-       rsp->discard_granularity =
-               cpu_to_le32(rnbd_dev_get_discard_granularity(rnbd_dev));
-       rsp->discard_alignment =
-               cpu_to_le32(rnbd_dev_get_discard_alignment(rnbd_dev));
-       rsp->secure_discard =
-               cpu_to_le16(rnbd_dev_get_secure_discard(rnbd_dev));
+       rsp->max_discard_sectors = cpu_to_le32(bdev_max_discard_sectors(bdev));
+       rsp->discard_granularity = cpu_to_le32(bdev_discard_granularity(bdev));
+       rsp->discard_alignment = cpu_to_le32(bdev_discard_alignment(bdev));
+       rsp->secure_discard = cpu_to_le16(bdev_max_secure_erase_sectors(bdev));
        rsp->cache_policy = 0;
-       if (bdev_write_cache(rnbd_dev->bdev))
+       if (bdev_write_cache(bdev))
                rsp->cache_policy |= RNBD_WRITEBACK;
-       if (bdev_fua(rnbd_dev->bdev))
+       if (bdev_fua(bdev))
                rsp->cache_policy |= RNBD_FUA;
 }