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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3677DC41513 for ; Thu, 10 Aug 2023 15:51:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235234AbjHJPvV (ORCPT ); Thu, 10 Aug 2023 11:51:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42110 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232196AbjHJPvU (ORCPT ); Thu, 10 Aug 2023 11:51:20 -0400 Received: from verein.lst.de (verein.lst.de [213.95.11.211]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8B81F1AA; Thu, 10 Aug 2023 08:51:20 -0700 (PDT) Received: by verein.lst.de (Postfix, from userid 2407) id 8CD7567373; Thu, 10 Aug 2023 17:51:16 +0200 (CEST) Date: Thu, 10 Aug 2023 17:51:16 +0200 From: Christoph Hellwig To: Christian Brauner Cc: Christoph Hellwig , Namjae Jeon , Sungjong Seo , Theodore Ts'o , Andreas Dilger , Konstantin Komarov , "Darrick J. Wong" , linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, ntfs3@lists.linux.dev, linux-xfs@vger.kernel.org, Al Viro Subject: Re: [PATCH 01/13] xfs: reformat the xfs_fs_free prototype Message-ID: <20230810155116.GC28000@lst.de> References: <20230809220545.1308228-1-hch@lst.de> <20230809220545.1308228-2-hch@lst.de> <20230810-unmerklich-grandios-281ae311e396@brauner> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230810-unmerklich-grandios-281ae311e396@brauner> User-Agent: Mutt/1.5.17 (2007-11-01) Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org I think the btrfs hunk (below) in "fs: use the super_block as holder when mounting file systems" needs to be dropped, as we dropped the prep patch that allows to use the sb as a holder for now. I'll add it to my resend of the btrfs conversion. diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index f1dd172d8d5bd7..d58ace4c1d2962 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -69,8 +69,6 @@ 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; @@ -1515,7 +1513,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); - btrfs_sb(s)->bdev_holder = fs_type; + fs_info->bdev_holder = s; error = btrfs_fill_super(s, fs_devices, data); } if (!error)