From patchwork Thu Mar 2 14:38:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Bader X-Patchwork-Id: 734618 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3vYw0x6lPXz9s7f; Fri, 3 Mar 2017 01:38:41 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1cjRsD-0003nN-NU; Thu, 02 Mar 2017 14:38:29 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1cjRs9-0003nB-25 for kernel-team@lists.ubuntu.com; Thu, 02 Mar 2017 14:38:25 +0000 Received: from 1.general.smb.uk.vpn ([10.172.193.28] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1cjRs8-0006w1-Np for kernel-team@lists.ubuntu.com; Thu, 02 Mar 2017 14:38:24 +0000 From: Stefan Bader To: kernel-team@lists.ubuntu.com Subject: [PATCH zesty] UBUNTU: SAUCE: bcache: Fix bcache device names Date: Thu, 2 Mar 2017 15:38:24 +0100 Message-Id: <1488465504-21967-1-git-send-email-stefan.bader@canonical.com> X-Mailer: git-send-email 2.7.4 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com I have sent this to upstream (got an ack already) but might be good to carry as SAUCE until it tickles back. -Stefan From 4a5ec18f2bec04cebb0cd5f7ab2a2999b86b7de5 Mon Sep 17 00:00:00 2001 From: Stefan Bader Date: Wed, 1 Mar 2017 11:28:07 +0100 Subject: [PATCH] UBUNTU: SAUCE: 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: # v4.10 Signed-off-by: Stefan Bader --- 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 fd66c7d..1809606 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;