Received-SPF: pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Wed, 10 Aug 2022 14:20:45 -0600 (MDT)
From:   =?UTF-8?Q?Marc_Aur=C3=A8le_La_France?= <tsi@tuyoix.net>
To:     "Theodore Ts'o" <tytso@mit.edu>,
        Andreas Dilger <adilger.kernel@dilger.ca>,
        linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] ext4: Register ext[23] support only after successful ext4
 registration
Message-ID: <7ef87cdb-0d0b-2488-6f42-a670a6454630@tuyoix.net>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="-1463807856-1187121505-1660162889=:21798"
Precedence: bulk

  This message is in MIME format.  The first part should be readable text,
  while the remaining parts are likely unreadable without MIME-aware tools.

---1463807856-1187121505-1660162889=:21798
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8BIT

Register ext4 as a "replacement" for ext2 and ext3 only after ext4 itself has
been successfully registered.  As a side effect, this allows
unregister_as_ext[23]() to be inlined.

This change is not eligible for stable@.

Please Reply-To-All.

Thanks and have a great day.

Marc.

Signed-off-by: Marc Aurèle La France <tsi@tuyoix.net>

diff -aNpRruz -X /etc/diff.excludes linux-5.17.1/fs/ext4/super.c devel-5.17.1/fs/ext4/super.c
--- linux-5.17.1/fs/ext4/super.c	2022-03-28 02:03:22.000000000 -0600
+++ devel-5.17.1/fs/ext4/super.c	2022-03-28 07:14:10.799008309 -0600
@@ -7123,16 +7123,14 @@ static int __init ext4_init_fs(void)
 	if (err)
 		goto out05;

-	register_as_ext3();
-	register_as_ext2();
 	err = register_filesystem(&ext4_fs_type);
 	if (err)
 		goto out;

+	register_as_ext3();
+	register_as_ext2();
 	return 0;
 out:
-	unregister_as_ext2();
-	unregister_as_ext3();
 	ext4_fc_destroy_dentry_cache();
 out05:
 	destroy_inodecache();
---1463807856-1187121505-1660162889=:21798--