Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp1727297ybz; Sat, 18 Apr 2020 07:16:16 -0700 (PDT) X-Google-Smtp-Source: APiQypJMuNGfy3r7cH1ToORakUH84WLjTUnmnD7YJQpkGc4Rl/C/veGOYwzs7L21Np2N2j+oOIHy X-Received: by 2002:aa7:cc88:: with SMTP id p8mr7269656edt.387.1587219375947; Sat, 18 Apr 2020 07:16:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587219375; cv=none; d=google.com; s=arc-20160816; b=a8/QVEgYukuR99uTWzVtoWC01sJA6V3NNmyCmsrssH79kmt730kIn6fHmVFMGC27zx SaCVcSwNBbaMXaJ3v5HL13UWtm04il5YOckF0ONnNS1gCv98PrgrSxbLA3yUQdmvQmQx Voh71ysyP15tFmYq04PxAOtreovnZ8p64TEtQftkww/dVbZoVkg4YXMHABs3RlYs/+cX yVDRnEEO6meshfDuKIOYlsj/GfBYzyoSmMbjEYipIxcdvkxVTi8ntjWT5d2ro2llSEEP 7ha/aogPLTrQy1sV2vq1VPDuKCiBTX4vNO+ASblVDTadshW0l2Z+50XjKi+ST636KPTl AOeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=zR98Rz3584QwqucqRUwsLlul0Io2vw8L0/J471l75oc=; b=U3myyQKJ1EjwTjEWf5TFmq1KFiJtN4RxfGP/Pj4w5dHE59/vDrqt9/CMzi47w2sfEi 4BedCRNu3hM5bY3RLC2zM9KSEBrZJ7C8KOVpRRc+fP3p6HUpYRKeOn4uRm/efHD3x1XF TsPGRmQc0VqIboT4cM4PTHGzs8jeNY1faQ36ktf9NhdJXiqMkaz4OAU+Ws8desSdCwVr 61fsoP7Wzzj/qSd8Hg2p3gw+oFeGnLd3EZuVJGMORob6w68N8aalBXoHsoMNPWucguLJ OIGHljExUkHvKNS6lhyQMVrek4W7itP4dIhNeiy9xadXvgf2kKgUbUBrZnfghNILdYFr FSdA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=2h074zuB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id x5si4525352ede.603.2020.04.18.07.15.53; Sat, 18 Apr 2020 07:16:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=2h074zuB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727771AbgDRONJ (ORCPT + 99 others); Sat, 18 Apr 2020 10:13:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:37512 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726687AbgDROJs (ORCPT ); Sat, 18 Apr 2020 10:09:48 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A28E922251; Sat, 18 Apr 2020 14:09:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587218988; bh=Yb0dT5Mf5FCK4nJCMD4GNxe6Lfw8RlG4lpvc3T+67PM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2h074zuBWcpcUuIFnOzMraH77sWthApCUFob+E9snEOVcywrMybZK6HTWYgjcaXzf 0YX3FS7NYFx0EZyfIUT+DfJp7DKMfxY8rGfHkbfQyPUH0F3gBfdtwbejH2FZD/SyCW aDppxZQbdCu+9aNDpoF27wX45VEugil17k1JT36w= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Christoph Hellwig , Jens Axboe , Sasha Levin , linux-block@vger.kernel.org Subject: [PATCH AUTOSEL 5.5 30/75] block: fix busy device checking in blk_drop_partitions Date: Sat, 18 Apr 2020 10:08:25 -0400 Message-Id: <20200418140910.8280-30-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200418140910.8280-1-sashal@kernel.org> References: <20200418140910.8280-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Christoph Hellwig [ Upstream commit d3ef5536274faf89e626276b833be122a16bdb81 ] bd_super is only set by get_tree_bdev and mount_bdev, and thus not by other openers like btrfs or the XFS realtime and log devices, as well as block devices directly opened from user space. Check bd_openers instead. Fixes: 77032ca66f86 ("Return EBUSY from BLKRRPART for mounted whole-dev fs") Signed-off-by: Christoph Hellwig Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- block/partition-generic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/partition-generic.c b/block/partition-generic.c index 564fae77711df..5f3b2a959aa51 100644 --- a/block/partition-generic.c +++ b/block/partition-generic.c @@ -468,7 +468,7 @@ int blk_drop_partitions(struct gendisk *disk, struct block_device *bdev) if (!disk_part_scan_enabled(disk)) return 0; - if (bdev->bd_part_count || bdev->bd_super) + if (bdev->bd_part_count || bdev->bd_openers) return -EBUSY; res = invalidate_partition(disk, 0); if (res) -- 2.20.1