From patchwork Wed May 16 18:36:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 10404655 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 61218601D2 for ; Wed, 16 May 2018 18:36:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 51F172863B for ; Wed, 16 May 2018 18:36:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 463F728671; Wed, 16 May 2018 18:36:15 +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 D7A3F2863B for ; Wed, 16 May 2018 18:36:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750937AbeEPSgO (ORCPT ); Wed, 16 May 2018 14:36:14 -0400 Received: from mail-qt0-f195.google.com ([209.85.216.195]:41395 "EHLO mail-qt0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750759AbeEPSgN (ORCPT ); Wed, 16 May 2018 14:36:13 -0400 Received: by mail-qt0-f195.google.com with SMTP id g13-v6so2397092qth.8 for ; Wed, 16 May 2018 11:36:13 -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=ze7KB1SrDFDe8yZ+JBxr6xuzoVQH1ypWNl/V8RU8t/M=; b=WJtncy7zpN7E60WyUphfkFuRyRXXhcxUf8PsQKDkMugOq5ezUMldteINg0m6hn4cqX lZ/59k6RUCDwTg1kgm6LSOk/jiPc58OU4so1wPD1q7vI4XjI2wHAyd1fDprkNl5kjsUK O9piq2YxQe6ORu0yY9S73rqagfCAJyrXzqgvzwoMcna1KUMpV/+C9NmgkP4/ghkcpL4o gkXh324yeQgUskQMtoY2fqL3BzSXv5Xtvb3nGz6ES3dbLJyGr6+8wUhGyAMlgan/s5W4 i4ok9J9ZIO53QgqnR+Js7es1eUbwAMKwEELBmPtxvCUKm71rDMThkTJ7wgfwC6xn0CxM TFPw== 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=ze7KB1SrDFDe8yZ+JBxr6xuzoVQH1ypWNl/V8RU8t/M=; b=JzorlG8WDc1Iffs5SORfBWkza9lhd2sa7FV1RBpZj8X8jK/GQCsFt2YozDKA7+NEzT NgxmMKAlfv9kBeIPiUPtMU10c5iopCbrTwYWlcMgDaO1/7NgmaxEw9B5nHydfnfDrioh 0JUbNK/bFy8q8o0WRZh0OjfOY9F2Pjgjq6nZFfqZlsEzO/HFebUn1+CII2TTggpEp+n8 zoInA92RcELPi1PejBbaiEe2tYIivraEiEqBvKwlcRcb6udpLSp3o5sPhukt4LcSHerK bPn08WiBp+AA0zWtTBYexdLn/TTy7ZBG3YHtUOCT+Eg9beDfC7swiW/argNIsKLtht8w Wyrg== X-Gm-Message-State: ALKqPwe2M6a2zpnAwh+vskYyvub7ra4homLHwt7iBy+Mac3UvqG9LzL2 aXDixoFRepx0PHh38LU1fpug9Q== X-Google-Smtp-Source: AB8JxZptDaztKzyfvm/l1uTWgSp0WjxCsN9eLW4CYKLgcaYwr73ujgsQLejBWrsC08D/MLbnbgtUyA== X-Received: by 2002:ac8:27c9:: with SMTP id x9-v6mr2199938qtx.374.1526495772870; Wed, 16 May 2018 11:36:12 -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 v189-v6sm2362825qka.79.2018.05.16.11.36.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 16 May 2018 11:36:12 -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 Subject: [PATCH 5/5] nbd: call nbd_bdev_reset instead of bd_set_size on disconnect Date: Wed, 16 May 2018 14:36:05 -0400 Message-Id: <20180516183605.16159-5-josef@toxicpanda.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180516183605.16159-1-josef@toxicpanda.com> References: <20180516183605.16159-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 We need to make sure we don't just set the size of the bdev to 0 while it's being used by a file system. We have the appropriate check in nbd_bdev_reset, simply use that helper instead. Signed-off-by: Josef Bacik --- drivers/block/nbd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index 24788bd10c8b..abc0a815354f 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -1127,7 +1127,7 @@ static int nbd_start_device_ioctl(struct nbd_device *nbd, struct block_device *b if (ret) sock_shutdown(nbd); mutex_lock(&nbd->config_lock); - bd_set_size(bdev, 0); + nbd_bdev_reset(bdev); /* user requested, ignore socket errors */ if (test_bit(NBD_DISCONNECT_REQUESTED, &config->runtime_flags)) ret = 0;