2017-03-02 12:06:46

by Stefan Bader

Subject: [PATCH] bcache: Fix bcache device names

When adding partition support to bcache, the name assignment was not
updated, resulting in numbers jumping (bcache0, bcache16, bcache32...).
Fix this by taking BCACHE_MINORS into account when assigning the disk
name.

BugLink: https://bugs.launchpad.net/bugs/1667078

Fixes: b8c0d91 (bcache: partition support: add 16 minors per bcacheN device)
Cc: <[email protected]> # v4.10
Signed-off-by: Stefan Bader <[email protected]>
---
drivers/md/bcache/super.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c
index 85e3f21..817e155 100644
--- a/drivers/md/bcache/super.c
+++ b/drivers/md/bcache/super.c
@@ -793,7 +793,8 @@ static int bcache_device_init(struct bcache_device *d, unsigned block_size,
}

set_capacity(d->disk, sectors);
- snprintf(d->disk->disk_name, DISK_NAME_LEN, "bcache%i", minor);
+ snprintf(d->disk->disk_name, DISK_NAME_LEN, "bcache%i",
+ minor / BCACHE_MINORS);

d->disk->major = bcache_major;
d->disk->first_minor = minor;
--
2.7.4

2017-03-02 14:14:01

by Coly Li

Subject: Re: [PATCH] bcache: Fix bcache device names

On 2017/3/2 下午7:11, Stefan Bader wrote:
> When adding partition support to bcache, the name assignment was not
> updated, resulting in numbers jumping (bcache0, bcache16, bcache32...).
> Fix this by taking BCACHE_MINORS into account when assigning the disk
> name.
>
> BugLink: https://bugs.launchpad.net/bugs/1667078
>
> Fixes: b8c0d91 (bcache: partition support: add 16 minors per bcacheN device)
> Cc: <[email protected]> # v4.10
> Signed-off-by: Stefan Bader <[email protected]>

Acked-by: Coly Li <[email protected]>

> ---
> drivers/md/bcache/super.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c
> index 85e3f21..817e155 100644
> --- a/drivers/md/bcache/super.c
> +++ b/drivers/md/bcache/super.c
> @@ -793,7 +793,8 @@ static int bcache_device_init(struct bcache_device *d, unsigned block_size,
> }
>
> set_capacity(d->disk, sectors);
> - snprintf(d->disk->disk_name, DISK_NAME_LEN, "bcache%i", minor);
> + snprintf(d->disk->disk_name, DISK_NAME_LEN, "bcache%i",
> + minor / BCACHE_MINORS);
>
> d->disk->major = bcache_major;
> d->disk->first_minor = minor;
>