From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C56A7C43211 for ; Mon, 29 Mar 2021 22:22:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8FA4A6198F for ; Mon, 29 Mar 2021 22:22:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232136AbhC2WWe (ORCPT ); Mon, 29 Mar 2021 18:22:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:46098 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231961AbhC2WWH (ORCPT ); Mon, 29 Mar 2021 18:22:07 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id AD13D6198A; Mon, 29 Mar 2021 22:22:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1617056526; bh=2xKGQUUFK8YeQRMSKWfNRRWjny9EKiRBskHn0N2MboE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=e9YY9qq1C8IibbnPjIDdPy7leLe7Rz+7phvfZHUkph3EaAmZDN3BPCg7RglZpHKKd 5GspMCzVrZZnu7er6NR3KP/27NhWQVEZbrx9T9mDnhQD9K+W+jfuAL7Hb318OGnxDa hNPOco2QotSQYYXybtJ68ygOFNBHHbJrfzYoQBIzP0z0GO25D4c3mlsVLGWY/z37K7 3YDmjQfAVTnjNKc4C7Rek641GaEBBd9+QowxjJzi8rU6CMF8QSmWnzmeOMtsW6WQa4 XYYzmBZ0q5K5LTb1kGR1DE7F1kEqZ5u8tixecXN0Q76fw8MxhJ4oqFcGH3AW61FuDJ U0h6Et68fc3Ww== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Chris Chiu , Christoph Hellwig , Jens Axboe , Sasha Levin , linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org Subject: [PATCH AUTOSEL 5.11 26/38] block: clear GD_NEED_PART_SCAN later in bdev_disk_changed Date: Mon, 29 Mar 2021 18:21:21 -0400 Message-Id: <20210329222133.2382393-26-sashal@kernel.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210329222133.2382393-1-sashal@kernel.org> References: <20210329222133.2382393-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org From: Chris Chiu [ Upstream commit 5116784039f0421e9a619023cfba3e302c3d9adc ] The GD_NEED_PART_SCAN is set by bdev_check_media_change to initiate a partition scan while removing a block device. It should be cleared after blk_drop_paritions because blk_drop_paritions could return -EBUSY and then the consequence __blkdev_get has no chance to do delete_partition if GD_NEED_PART_SCAN already cleared. It causes some problems on some card readers. Ex. Realtek card reader 0bda:0328 and 0bda:0158. The device node of the partition will not disappear after the memory card removed. Thus the user applications can not update the device mapping correctly. BugLink: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1920874 Signed-off-by: Chris Chiu Reviewed-by: Christoph Hellwig Link: https://lore.kernel.org/r/20210323085219.24428-1-chris.chiu@canonical.com Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- fs/block_dev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/block_dev.c b/fs/block_dev.c index c33151020bcd..85500e2400cf 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -1240,13 +1240,13 @@ int bdev_disk_changed(struct block_device *bdev, bool invalidate) lockdep_assert_held(&bdev->bd_mutex); - clear_bit(GD_NEED_PART_SCAN, &bdev->bd_disk->state); - rescan: ret = blk_drop_partitions(bdev); if (ret) return ret; + clear_bit(GD_NEED_PART_SCAN, &disk->state); + /* * Historically we only set the capacity to zero for devices that * support partitions (independ of actually having partitions created). -- 2.30.1