c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-25 03:37:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

linux/super: remove zpl_parse_monolithic

Browse Source 
Final bit of cleanup of the old method.

Sponsored-by: TrueNAS
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Rob Norris <rob.norris@truenas.com>
Closes #18377
This commit is contained in:
Rob Norris
2026-03-26 14:38:13 +11:00
committed by Tony Hutter
parent 36ae5a65aa
commit f5a60b6cae
1 changed files with 2 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/os/linux/zfs/zpl_super.c
+2 -27
View File
@@ -390,30 +390,6 @@ zpl_prune_sb(uint64_t nr_to_scan, void *arg)
#endif #endif
} }
static int
zpl_parse_monolithic(struct fs_context *fc, void *data)
{
if (data == NULL)
return (0);
/*
* Because we supply a .parse_monolithic callback, the kernel does
* no consideration of the options blob at all. Because of this, we
* have to give LSMs a first look at it. They will remove any options
* of interest to them (eg the SELinux *context= options).
*/
int err = security_sb_eat_lsm_opts((char *)data, &fc->security);
if (err)
return (err);
/*
* Whatever is left we stash on in the fs_context so we can pass it
* down to zfs_domount() or zfs_remount() later.
*/
fc->fs_private = data;
return (0);
}
static int static int
zpl_get_tree(struct fs_context *fc) zpl_get_tree(struct fs_context *fc)
{ {
@@ -472,7 +448,7 @@ zpl_get_tree(struct fs_context *fc)
if (sb->s_root == NULL) { if (sb->s_root == NULL) {
zfs_mnt_t zm = { zfs_mnt_t zm = {
.mnt_osname = fc->source, .mnt_osname = fc->source,
.mnt_data = fc->fs_private, .mnt_data = NULL,
}; };
fstrans_cookie_t cookie = spl_fstrans_mark(); fstrans_cookie_t cookie = spl_fstrans_mark();
@@ -505,7 +481,7 @@ zpl_get_tree(struct fs_context *fc)
static int static int
zpl_reconfigure(struct fs_context *fc) zpl_reconfigure(struct fs_context *fc)
{ {
zfs_mnt_t zm = { .mnt_osname = NULL, .mnt_data = fc->fs_private }; zfs_mnt_t zm = { .mnt_osname = NULL, .mnt_data = NULL };
fstrans_cookie_t cookie; fstrans_cookie_t cookie;
int error; int error;
@@ -518,7 +494,6 @@ zpl_reconfigure(struct fs_context *fc)
} }
const struct fs_context_operations zpl_fs_context_operations = { const struct fs_context_operations zpl_fs_context_operations = {
.parse_monolithic = zpl_parse_monolithic,
.get_tree = zpl_get_tree, .get_tree = zpl_get_tree,
.reconfigure = zpl_reconfigure, .reconfigure = zpl_reconfigure,
}; };