rnbd: port block device access to file

Link: https://lore.kernel.org/r/20240123-vfs-bdev-file-v2-10-adbd023e19cc@kernel.org
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Christian Brauner <brauner@kernel.org>

diff --git a/drivers/block/rnbd/rnbd-srv.c b/drivers/block/rnbd/rnbd-srv.c
index 3a0d5dcec6f2559f85b13c432248533651c27c44..f6e3a3c4b76cc48b9b1fbe92c5cdca361598f08f 100644 (file)
--- a/drivers/block/rnbd/rnbd-srv.c
+++ b/drivers/block/rnbd/rnbd-srv.c
@@ -145,7 +145,7 @@ static int process_rdma(struct rnbd_srv_session *srv_sess,
        priv->sess_dev = sess_dev;
        priv->id = id;
 
-       bio = bio_alloc(sess_dev->bdev_handle->bdev, 1,
+       bio = bio_alloc(file_bdev(sess_dev->bdev_file), 1,
                        rnbd_to_bio_flags(le32_to_cpu(msg->rw)), GFP_KERNEL);
        if (bio_add_page(bio, virt_to_page(data), datalen,
                        offset_in_page(data)) != datalen) {
@@ -219,7 +219,7 @@ void rnbd_destroy_sess_dev(struct rnbd_srv_sess_dev *sess_dev, bool keep_id)
        rnbd_put_sess_dev(sess_dev);
        wait_for_completion(&dc); /* wait for inflights to drop to zero */
 
-       bdev_release(sess_dev->bdev_handle);
+       fput(sess_dev->bdev_file);
        mutex_lock(&sess_dev->dev->lock);
        list_del(&sess_dev->dev_list);
        if (!sess_dev->readonly)
@@ -534,7 +534,7 @@ rnbd_srv_get_or_create_srv_dev(struct block_device *bdev,
 static void rnbd_srv_fill_msg_open_rsp(struct rnbd_msg_open_rsp *rsp,
                                        struct rnbd_srv_sess_dev *sess_dev)
 {
-       struct block_device *bdev = sess_dev->bdev_handle->bdev;
+       struct block_device *bdev = file_bdev(sess_dev->bdev_file);
 
        rsp->hdr.type = cpu_to_le16(RNBD_MSG_OPEN_RSP);
        rsp->device_id = cpu_to_le32(sess_dev->device_id);
@@ -560,7 +560,7 @@ static void rnbd_srv_fill_msg_open_rsp(struct rnbd_msg_open_rsp *rsp,
 static struct rnbd_srv_sess_dev *
 rnbd_srv_create_set_sess_dev(struct rnbd_srv_session *srv_sess,
                              const struct rnbd_msg_open *open_msg,
-                             struct bdev_handle *handle, bool readonly,
+                             struct file *bdev_file, bool readonly,
                              struct rnbd_srv_dev *srv_dev)
 {
        struct rnbd_srv_sess_dev *sdev = rnbd_sess_dev_alloc(srv_sess);
@@ -572,7 +572,7 @@ rnbd_srv_create_set_sess_dev(struct rnbd_srv_session *srv_sess,
 
        strscpy(sdev->pathname, open_msg->dev_name, sizeof(sdev->pathname));
 
-       sdev->bdev_handle       = handle;
+       sdev->bdev_file         = bdev_file;
        sdev->sess              = srv_sess;
        sdev->dev               = srv_dev;
        sdev->readonly          = readonly;
@@ -678,7 +678,7 @@ static int process_msg_open(struct rnbd_srv_session *srv_sess,
        struct rnbd_srv_dev *srv_dev;
        struct rnbd_srv_sess_dev *srv_sess_dev;
        const struct rnbd_msg_open *open_msg = msg;
-       struct bdev_handle *bdev_handle;
+       struct file *bdev_file;
        blk_mode_t open_flags = BLK_OPEN_READ;
        char *full_path;
        struct rnbd_msg_open_rsp *rsp = data;
@@ -716,15 +716,15 @@ static int process_msg_open(struct rnbd_srv_session *srv_sess,
                goto reject;
        }
 
-       bdev_handle = bdev_open_by_path(full_path, open_flags, NULL, NULL);
-       if (IS_ERR(bdev_handle)) {
-               ret = PTR_ERR(bdev_handle);
+       bdev_file = bdev_file_open_by_path(full_path, open_flags, NULL, NULL);
+       if (IS_ERR(bdev_file)) {
+               ret = PTR_ERR(bdev_file);
                pr_err("Opening device '%s' on session %s failed, failed to open the block device, err: %pe\n",
-                      full_path, srv_sess->sessname, bdev_handle);
+                      full_path, srv_sess->sessname, bdev_file);
                goto free_path;
        }
 
-       srv_dev = rnbd_srv_get_or_create_srv_dev(bdev_handle->bdev, srv_sess,
+       srv_dev = rnbd_srv_get_or_create_srv_dev(file_bdev(bdev_file), srv_sess,
                                                  open_msg->access_mode);
        if (IS_ERR(srv_dev)) {
                pr_err("Opening device '%s' on session %s failed, creating srv_dev failed, err: %pe\n",
@@ -734,7 +734,7 @@ static int process_msg_open(struct rnbd_srv_session *srv_sess,
        }
 
        srv_sess_dev = rnbd_srv_create_set_sess_dev(srv_sess, open_msg,
-                               bdev_handle,
+                               bdev_file,
                                open_msg->access_mode == RNBD_ACCESS_RO,
                                srv_dev);
        if (IS_ERR(srv_sess_dev)) {
@@ -750,7 +750,7 @@ static int process_msg_open(struct rnbd_srv_session *srv_sess,
         */
        mutex_lock(&srv_dev->lock);
        if (!srv_dev->dev_kobj.state_in_sysfs) {
-               ret = rnbd_srv_create_dev_sysfs(srv_dev, bdev_handle->bdev);
+               ret = rnbd_srv_create_dev_sysfs(srv_dev, file_bdev(bdev_file));
                if (ret) {
                        mutex_unlock(&srv_dev->lock);
                        rnbd_srv_err(srv_sess_dev,
@@ -793,7 +793,7 @@ srv_dev_put:
        }
        rnbd_put_srv_dev(srv_dev);
 blkdev_put:
-       bdev_release(bdev_handle);
+       fput(bdev_file);
 free_path:
        kfree(full_path);
 reject:

diff --git a/drivers/block/rnbd/rnbd-srv.h b/drivers/block/rnbd/rnbd-srv.h
index 343cc682b617b4447e813e0027a7ed009133fe23..18d873808b8d835d61017124939b880dfc2d26d8 100644 (file)
--- a/drivers/block/rnbd/rnbd-srv.h
+++ b/drivers/block/rnbd/rnbd-srv.h
@@ -46,7 +46,7 @@ struct rnbd_srv_dev {
 struct rnbd_srv_sess_dev {
        /* Entry inside rnbd_srv_dev struct */
        struct list_head                dev_list;
-       struct bdev_handle              *bdev_handle;
+       struct file                     *bdev_file;
        struct rnbd_srv_session         *sess;
        struct rnbd_srv_dev             *dev;
        struct kobject                  kobj;