Received-SPF: pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20220713055317.1888500-1-hch@lst.de> <20220713055317.1888500-7-hch@lst.de>
In-Reply-To: <20220713055317.1888500-7-hch@lst.de>
From:   Jinpu Wang <jinpu.wang@ionos.com>
Date:   Wed, 13 Jul 2022 09:03:30 +0200
Message-ID: <CAMGffEkbzTKkYY2yt-G8t1nO+y3+2+97=-ZgeUdF+ZE3iZvjng@mail.gmail.com>
Subject: Re: [PATCH 6/9] rnbd-srv: remove the name field from struct rnbd_dev
To:     Christoph Hellwig <hch@lst.de>
Cc:     Jens Axboe <axboe@kernel.dk>,
        =?UTF-8?Q?Christoph_B=C3=B6hmwalder?= 
        <christoph.boehmwalder@linbit.com>,
        "Md. Haris Iqbal" <haris.iqbal@ionos.com>,
        Song Liu <song@kernel.org>, "Theodore Ts'o" <tytso@mit.edu>,
        Andreas Dilger <adilger.kernel@dilger.ca>,
        Jan Kara <jack@suse.com>, Mark Fasheh <mark@fasheh.com>,
        Joel Becker <jlbec@evilplan.org>,
        Joseph Qi <joseph.qi@linux.alibaba.com>,
        linux-block@vger.kernel.org, drbd-dev@lists.linbit.com,
        linux-raid@vger.kernel.org, linux-ext4@vger.kernel.org,
        ocfs2-devel@oss.oracle.com
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Wed, Jul 13, 2022 at 7:53 AM Christoph Hellwig <hch@lst.de> wrote:
>
> 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>
Thx!
> ---
>  drivers/block/rnbd/rnbd-srv-dev.c   | 1 -
>  drivers/block/rnbd/rnbd-srv-dev.h   | 1 -
>  drivers/block/rnbd/rnbd-srv-sysfs.c | 5 ++---
>  drivers/block/rnbd/rnbd-srv.c       | 9 ++++-----
>  drivers/block/rnbd/rnbd-srv.h       | 3 +--
>  5 files changed, 7 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/block/rnbd/rnbd-srv-dev.c b/drivers/block/rnbd/rnbd-srv-dev.c
> index c5d0a03911659..c63017f6e4214 100644
> --- 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 4309e52524691..8407d12f70afe 100644
> --- 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 feaa76c5a3423..297a6924ff4e2 100644
> --- 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 beaef43a67b9d..0713014bf423f 100644
> --- 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 be2ae486d407e..6926f9069dc4b 100644
> --- 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);
> --
> 2.30.2
>