rnbd-srv: remove the name field from struct rnbd_dev

Just print the block device name directly using the %pg format specifier.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Jack Wang <jinpu.wang@ionos.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Link: https://lore.kernel.org/r/20220713055317.1888500-7-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/block/rnbd/rnbd-srv-dev.c b/drivers/block/rnbd/rnbd-srv-dev.c
index c5d0a03911659d5f28e724e76a68257d02b79c07..c63017f6e421494d9d83485147da7c44f516bf2a 100644 (file)
--- a/drivers/block/rnbd/rnbd-srv-dev.c
+++ b/drivers/block/rnbd/rnbd-srv-dev.c
@@ -28,7 +28,6 @@ struct rnbd_dev *rnbd_dev_open(const char *path, fmode_t flags)
                goto err;
 
        dev->blk_open_flags = flags;
-       bdevname(dev->bdev, dev->name);
 
        return dev;
 

diff --git a/drivers/block/rnbd/rnbd-srv-dev.h b/drivers/block/rnbd/rnbd-srv-dev.h
index 4309e52524691b9df4df0399d99a0d98060f53fc..8407d12f70afee6f61c0a5e9255830d8501a03c7 100644 (file)
--- a/drivers/block/rnbd/rnbd-srv-dev.h
+++ b/drivers/block/rnbd/rnbd-srv-dev.h
@@ -15,7 +15,6 @@
 struct rnbd_dev {
        struct block_device     *bdev;
        fmode_t                 blk_open_flags;
-       char                    name[BDEVNAME_SIZE];
 };
 
 /**

diff --git a/drivers/block/rnbd/rnbd-srv-sysfs.c b/drivers/block/rnbd/rnbd-srv-sysfs.c
index feaa76c5a34232ffa88d0bcad4c873d84b8a5344..297a6924ff4e20952b469d7a92f342d4441990af 100644 (file)
--- a/drivers/block/rnbd/rnbd-srv-sysfs.c
+++ b/drivers/block/rnbd/rnbd-srv-sysfs.c
@@ -38,14 +38,13 @@ static struct kobj_type dev_ktype = {
 };
 
 int rnbd_srv_create_dev_sysfs(struct rnbd_srv_dev *dev,
-                              struct block_device *bdev,
-                              const char *dev_name)
+                              struct block_device *bdev)
 {
        struct kobject *bdev_kobj;
        int ret;
 
        ret = kobject_init_and_add(&dev->dev_kobj, &dev_ktype,
-                                  rnbd_devs_kobj, dev_name);
+                                  rnbd_devs_kobj, "%pg", bdev);
        if (ret) {
                kobject_put(&dev->dev_kobj);
                return ret;

diff --git a/drivers/block/rnbd/rnbd-srv.c b/drivers/block/rnbd/rnbd-srv.c
index beaef43a67b9deee8a6bbd7303de602f8be6939f..0713014bf423f7192ac7fdeb9fb2763d2642233e 100644 (file)
--- a/drivers/block/rnbd/rnbd-srv.c
+++ b/drivers/block/rnbd/rnbd-srv.c
@@ -419,7 +419,7 @@ static struct rnbd_srv_sess_dev
        return sess_dev;
 }
 
-static struct rnbd_srv_dev *rnbd_srv_init_srv_dev(const char *id)
+static struct rnbd_srv_dev *rnbd_srv_init_srv_dev(struct block_device *bdev)
 {
        struct rnbd_srv_dev *dev;
 
@@ -427,7 +427,7 @@ static struct rnbd_srv_dev *rnbd_srv_init_srv_dev(const char *id)
        if (!dev)
                return ERR_PTR(-ENOMEM);
 
-       strscpy(dev->id, id, sizeof(dev->id));
+       snprintf(dev->id, sizeof(dev->id), "%pg", bdev);
        kref_init(&dev->kref);
        INIT_LIST_HEAD(&dev->sess_dev_list);
        mutex_init(&dev->lock);
@@ -512,7 +512,7 @@ rnbd_srv_get_or_create_srv_dev(struct rnbd_dev *rnbd_dev,
        int ret;
        struct rnbd_srv_dev *new_dev, *dev;
 
-       new_dev = rnbd_srv_init_srv_dev(rnbd_dev->name);
+       new_dev = rnbd_srv_init_srv_dev(rnbd_dev->bdev);
        if (IS_ERR(new_dev))
                return new_dev;
 
@@ -758,8 +758,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, rnbd_dev->bdev,
-                                                rnbd_dev->name);
+               ret = rnbd_srv_create_dev_sysfs(srv_dev, rnbd_dev->bdev);
                if (ret) {
                        mutex_unlock(&srv_dev->lock);
                        rnbd_srv_err(srv_sess_dev,

diff --git a/drivers/block/rnbd/rnbd-srv.h b/drivers/block/rnbd/rnbd-srv.h
index be2ae486d407e6bea0869ab48af4259aba6de0ce..6926f9069dc4bfdafbeaae73bc62a5a1f69ee3f3 100644 (file)
--- a/drivers/block/rnbd/rnbd-srv.h
+++ b/drivers/block/rnbd/rnbd-srv.h
@@ -68,8 +68,7 @@ void rnbd_srv_sess_dev_force_close(struct rnbd_srv_sess_dev *sess_dev,
 /* rnbd-srv-sysfs.c */
 
 int rnbd_srv_create_dev_sysfs(struct rnbd_srv_dev *dev,
-                             struct block_device *bdev,
-                             const char *dir_name);
+                             struct block_device *bdev);
 void rnbd_srv_destroy_dev_sysfs(struct rnbd_srv_dev *dev);
 int rnbd_srv_create_dev_session_sysfs(struct rnbd_srv_sess_dev *sess_dev);
 void rnbd_srv_destroy_dev_session_sysfs(struct rnbd_srv_sess_dev *sess_dev);