Skip to contentSkip to conversation

mount: remove redundant panic() in mnt_init()

PATCH Applied Hamza Mahfooz 3 participants 3 messages Jul 20 – Jul 22 VFS

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mount: remove redundant panic() in mnt_init()

Since at least as far back as commit 0818bf27c05b ("resizable namespace.c hashes"), we call alloc_large_system_hash() in mnt_init() which already panics if the table is NULL.

---
 fs/namespace.c | 3 ---
 1 file changed, 3 deletions(-)
fs/namespace.c +0 -3
index fe919abd2f01..43de01ce023e 100644
@@ -6248,9 +6248,6 @@ void __init mnt_init(void)
 				HASH_ZERO,
 				&mp_hash_shift, &mp_hash_mask, 0, 0);
 
-	if (!mount_hashtable || !mountpoint_hashtable)
-		panic("Failed to allocate mount hash table\n");
-
 	kernfs_init();
 
 	err = sysfs_init();
Signature · 1 line
2.55.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 26 lines · Hamza Mahfooz

Since at least as far back as commit 0818bf27c05b ("resizable namespace.c hashes"), we call alloc_large_system_hash() in mnt_init() which already panics if the table is NULL.

---
 fs/namespace.c | 3 ---
 1 file changed, 3 deletions(-)
fs/namespace.c +0 -3
index fe919abd2f01..43de01ce023e 100644
@@ -6248,9 +6248,6 @@ void __init mnt_init(void)
 				HASH_ZERO,
 				&mp_hash_shift, &mp_hash_mask, 0, 0);
 
-	if (!mount_hashtable || !mountpoint_hashtable)
-		panic("Failed to allocate mount hash table\n");
-
 	kernfs_init();
 
 	err = sysfs_init();
Signature · 1 line
2.55.0

There isn't a reasonable way to return from this, and I see the other uses of alloc_large_system_hash() also don't check for NULL, so this is an OK clean-up.

maintainer Applied
#2 lore raw
In reply to Hamza Mahfooz
Quoted 1 line · Hamza Mahfooz

mount: remove redundant panic() in mnt_init()

Applied to the vfs-7.3.mount branch of the vfs/vfs.git tree. Patches in the vfs-7.3.mount branch should appear in linux-next soon.

Please report any outstanding bugs that were missed during review in a new review to the original patch series allowing us to drop it.

It's encouraged to provide Acked-bys and Reviewed-bys even though the patch has now been applied. If possible patch trailers will be updated.

Note that commit hashes shown below are subject to change due to rebase, trailer updates or similar. If in doubt, please check the listed branch.

tree:   https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git
branch: vfs-7.3.mount

[1/1] mount: remove redundant panic() in mnt_init()

      https://git.kernel.org/vfs/vfs/c/083e8742e301