From patchwork Fri Aug 11 10:08:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 13350422 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4A753C07E8D for ; Fri, 11 Aug 2023 10:08:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233923AbjHKKIr (ORCPT ); Fri, 11 Aug 2023 06:08:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49764 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235435AbjHKKIk (ORCPT ); Fri, 11 Aug 2023 06:08:40 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 742B7E3; Fri, 11 Aug 2023 03:08:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=zjW5l1wDCFCu1pt1F8sv0aM8FWD26mmo/JL5KKCdSVc=; b=FLY/bEYIE/O6+NT+S/Mq95/r4q KbdDpVEX1AzOR9mg158RJ8u4nVDaKwzZDPKqlYXpv1hJVBbp+ooEeVpKTD3W8Ptb9V1swX1/QmLQL mxQ0J3YSDFdQaVriWRdeIezdUaanTl1C7etOiswe+fwADJXvujqc1cuQXNKNQJvm9qPjEhKrQwFuP dz906g0PSLyFYc8WzsAsuEQlwYNzsGRv5pEdx5YMF8412opsklTpUEDBglBQqKh5lYahvgmrDjBf5 F3dqgOGPFWbTjsVb8VNlt+o5xySVp3R9xnW/b8uWriDFl38D/MBVtQRXF5d9Rp4cpDl1aHzue8e2o M+saUX9A==; Received: from [88.128.92.63] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.96 #2 (Red Hat Linux)) id 1qUP4L-00A5Yk-2W; Fri, 11 Aug 2023 10:08:34 +0000 From: Christoph Hellwig To: Al Viro , Christian Brauner Cc: Jens Axboe , Denis Efremov , Josef Bacik , Stefan Haberland , Jan Hoeppner , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , "Darrick J . Wong" , Chris Mason , David Sterba , linux-block@vger.kernel.org, nbd@other.debian.org, linux-s390@vger.kernel.org, linux-btrfs@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 01/17] FOLD: reverts part of "fs: use the super_block as holder when mounting file systems" Date: Fri, 11 Aug 2023 12:08:12 +0200 Message-Id: <20230811100828.1897174-2-hch@lst.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230811100828.1897174-1-hch@lst.de> References: <20230811100828.1897174-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org The btrfs hunk should be dropped because the prerequisite btrfs changes were dropped from the branch. Signed-off-by: Christoph Hellwig --- fs/btrfs/super.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index d58ace4c1d2962..f1dd172d8d5bd7 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -69,6 +69,8 @@ static const struct super_operations btrfs_super_ops; * requested by subvol=/path. That way the callchain is straightforward and we * don't have to play tricks with the mount options and recursive calls to * btrfs_mount. + * + * The new btrfs_root_fs_type also servers as a tag for the bdev_holder. */ static struct file_system_type btrfs_fs_type; static struct file_system_type btrfs_root_fs_type; @@ -1513,7 +1515,7 @@ static struct dentry *btrfs_mount_root(struct file_system_type *fs_type, snprintf(s->s_id, sizeof(s->s_id), "%pg", bdev); shrinker_debugfs_rename(&s->s_shrink, "sb-%s:%s", fs_type->name, s->s_id); - fs_info->bdev_holder = s; + btrfs_sb(s)->bdev_holder = fs_type; error = btrfs_fill_super(s, fs_devices, data); } if (!error)