From f828aeb62aea9181ea8b515963ee2f3bdf68d363 Mon Sep 17 00:00:00 2001 From: Rob Norris Date: Sun, 15 Mar 2026 12:33:27 +1100 Subject: [PATCH] linux/super: remove support for old mount API Removing the HAVE_FS_CONTEXT gates and anything that would be used if it wasn't set. Sponsored-by: TrueNAS Reviewed-by: Brian Behlendorf Signed-off-by: Rob Norris Closes #18339 --- module/os/linux/zfs/zpl_super.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/module/os/linux/zfs/zpl_super.c b/module/os/linux/zfs/zpl_super.c index f8d1e2a55..b74f4f58a 100644 --- a/module/os/linux/zfs/zpl_super.c +++ b/module/os/linux/zfs/zpl_super.c @@ -36,9 +36,7 @@ #include #include #include -#ifdef HAVE_FS_CONTEXT #include -#endif /* * What to do when the last reference to an inode is released. If 0, the kernel @@ -508,7 +506,6 @@ zpl_prune_sb(uint64_t nr_to_scan, void *arg) #endif } -#ifdef HAVE_FS_CONTEXT /* * Since kernel 5.2, the "new" fs_context-based mount API has been preferred * over the traditional file_system_type->mount() and @@ -559,7 +556,6 @@ zpl_init_fs_context(struct fs_context *fc) fc->ops = &zpl_fs_context_operations; return (0); } -#endif const struct super_operations zpl_super_operations = { .alloc_inode = zpl_inode_alloc, @@ -574,9 +570,6 @@ const struct super_operations zpl_super_operations = { .put_super = zpl_put_super, .sync_fs = zpl_sync_fs, .statfs = zpl_statfs, -#ifndef HAVE_FS_CONTEXT - .remount_fs = zpl_remount_fs, -#endif .show_devname = zpl_show_devname, .show_options = zpl_show_options, .show_stats = NULL, @@ -619,11 +612,7 @@ struct file_system_type zpl_fs_type = { #else .fs_flags = FS_USERNS_MOUNT, #endif -#ifdef HAVE_FS_CONTEXT .init_fs_context = zpl_init_fs_context, -#else - .mount = zpl_mount, -#endif .kill_sb = zpl_kill_sb, };