From patchwork Wed May 16 18:51:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 10404665 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6EFA3601F7 for ; Wed, 16 May 2018 18:51:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5F18828384 for ; Wed, 16 May 2018 18:51:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 53BDC285EB; Wed, 16 May 2018 18:51:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DE40D28384 for ; Wed, 16 May 2018 18:51:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751098AbeEPSvb (ORCPT ); Wed, 16 May 2018 14:51:31 -0400 Received: from mail-qt0-f194.google.com ([209.85.216.194]:36276 "EHLO mail-qt0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751155AbeEPSv3 (ORCPT ); Wed, 16 May 2018 14:51:29 -0400 Received: by mail-qt0-f194.google.com with SMTP id q6-v6so2478250qtn.3 for ; Wed, 16 May 2018 11:51:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toxicpanda-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZhWmV5sfhtkkuHglJ7PcDiAzwwGZxccZbsGeArt6wuw=; b=YB7ok22mGQr6jzlmdOdOQ7cgwRA33MVAvZZ2yvJotAwGP5Xi0qnwSTbyjz7Er8OYYw 5LWMSIcudY0wZrUav6lAv9KNzelnIc8eXLYUluW4zzuZP6kwl6RzA9n1q+KdDOgkcYRY D2UdjsT2VYP9PipUkd+lAAVM2ShL/OodN8TSXK8GX9pjeVi8ySx6wIyJmMGUODb8iB3Y UtP2TH7f80ihle6JCiDFR/e4pHiLnoPChztWYFvVPAokxNYXK/TSDXFbQpEAGq+C4rMt GybVEtSvv1YKwGpz+mnhSIuYDfbPm9L7bsZWORKfjE49TWHH1MFzuIM9UFQd6KEdlO18 0qPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ZhWmV5sfhtkkuHglJ7PcDiAzwwGZxccZbsGeArt6wuw=; b=a0kkDWNeDAuk+MVn+ti2tpXUjxEstVCTiQM+QFyRSKjRnIWOwJdb+Im9ui+fXtBXNG 8Ky5mdWvURYobIr0rOxIfrSmOPPVckwgGNsCoF8+OEpcYOXAsMpzy4cMgREM180movCu k12EM+HhdzLFpTSY0yHlk1OlfD6uszNLzU+Y7CH0335rVwflmYrO+pyEhau+Zj7Gp+Wz I27rl0HQo+26LPWeNxUcwGnJnsi9OOsCSVeeZiTNENKT1KXvEeDSWtt3pQgnfM32LFZZ XG7HTKRXg6s/Nk3wdQQ19BOZ2MvTwD9SM++zWEpDqjW6OaYge5F+CkRZZJQ6sp4Tsmz+ RY/g== X-Gm-Message-State: ALKqPwdkhjR914u7jHYlVgf68Sj7eodAwR8qBHSKkBJ3YzYgvkwJ+E4t bspt54e1EgQVRdyWjGTyltchyg== X-Google-Smtp-Source: AB8JxZoe4V7eW3W2ReQe/gmCP+UOOFT4+sOmPbGrVYb1Vdg8sW3iJD14+U/Ao8NV0ZgffhQxJhKWOw== X-Received: by 2002:aed:2441:: with SMTP id s1-v6mr2323175qtc.176.1526496688861; Wed, 16 May 2018 11:51:28 -0700 (PDT) Received: from localhost (cpe-2606-A000-4381-1201-225-22FF-FEB3-E51A.dyn6.twc.com. [2606:a000:4381:1201:225:22ff:feb3:e51a]) by smtp.gmail.com with ESMTPSA id m18-v6sm2251921qke.84.2018.05.16.11.51.27 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 16 May 2018 11:51:28 -0700 (PDT) From: Josef Bacik To: axboe@kernel.dk, nbd@other.debian.org, linux-block@vger.kernel.org, kernel-team@fb.com Cc: Josef Bacik , stable@vger.kernel.org Subject: [PATCH 4/7] nbd: use bd_set_size when updating disk size Date: Wed, 16 May 2018 14:51:19 -0400 Message-Id: <20180516185122.18590-4-josef@toxicpanda.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180516185122.18590-1-josef@toxicpanda.com> References: <20180516185122.18590-1-josef@toxicpanda.com> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Josef Bacik When we stopped relying on the bdev everywhere I broke updating the block device size on the fly, which ceph relies on. We can't just do set_capacity, we also have to do bd_set_size so things like parted will notice the device size change. Fixes: 29eaadc ("nbd: stop using the bdev everywhere") cc: stable@vger.kernel.org Signed-off-by: Josef Bacik --- drivers/block/nbd.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index b709abf3cb79..64278f472efe 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -234,9 +234,18 @@ static void nbd_size_clear(struct nbd_device *nbd) static void nbd_size_update(struct nbd_device *nbd) { struct nbd_config *config = nbd->config; + struct block_device *bdev = bdget_disk(nbd->disk, 0); + blk_queue_logical_block_size(nbd->disk->queue, config->blksize); blk_queue_physical_block_size(nbd->disk->queue, config->blksize); set_capacity(nbd->disk, config->bytesize >> 9); + if (bdev) { + if (bdev->bd_disk) + bd_set_size(bdev, config->bytesize); + else + bdev->bd_invalidated = 1; + bdput(bdev); + } kobject_uevent(&nbd_to_dev(nbd)->kobj, KOBJ_CHANGE); } @@ -1114,7 +1123,6 @@ static int nbd_start_device_ioctl(struct nbd_device *nbd, struct block_device *b if (ret) return ret; - bd_set_size(bdev, config->bytesize); if (max_part) bdev->bd_invalidated = 1; mutex_unlock(&nbd->config_lock);