bianbu-repo-mirror/bianbu-linux-6.6
1
0
Fork 0
mirror of https://gitee.com/bianbu-linux/linux-6.6 synced 2025-04-24 14:07:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fs_context: drop the unused lsm_flags member

Browse source 
This isn't ever used by VFS now, and it couldn't even work. Any FS that
uses the SECURITY_LSM_NATIVE_LABELS flag needs to also process the
value returned back from the LSM, so it needs to do its
security_sb_set_mnt_opts() call on its own anyway.

Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>
Signed-off-by: Christian Brauner (Microsoft) <brauner@kernel.org>
This commit is contained in:
Ondrej Mosnacek 2023-03-16 14:07:51 +01:00 • committed by Christian Brauner (Microsoft)
parent 74e60b8b2f
commit 4e04143c86
No known key found for this signature in database
GPG key ID: 91C61BC06578DCA2
4 changed files with 1 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Documentation/filesystems/mount_api.rst
View file

@ -79,7 +79,6 @@ context. This is represented by the fs_context structure::
unsigned int sb_flags; unsigned int sb_flags;
unsigned int sb_flags_mask; unsigned int sb_flags_mask;
unsigned int s_iflags; unsigned int s_iflags;
unsigned int lsm_flags;
enum fs_context_purpose purpose:8; enum fs_context_purpose purpose:8;
... ...
}; };

3
fs/nfs/super.c
View file

@ -1274,9 +1274,6 @@ int nfs_get_tree_common(struct fs_context *fc)
if (ctx->clone_data.sb->s_flags & SB_SYNCHRONOUS) if (ctx->clone_data.sb->s_flags & SB_SYNCHRONOUS)
fc->sb_flags |= SB_SYNCHRONOUS; fc->sb_flags |= SB_SYNCHRONOUS;
if (server->caps & NFS_CAP_SECURITY_LABEL)
fc->lsm_flags |= SECURITY_LSM_NATIVE_LABELS;
/* Get a superblock - note that we may end up sharing one that already exists */ /* Get a superblock - note that we may end up sharing one that already exists */
fc->s_fs_info = server; fc->s_fs_info = server;
s = sget_fc(fc, compare_super, nfs_set_super); s = sget_fc(fc, compare_super, nfs_set_super);

1
include/linux/fs_context.h
View file

@ -104,7 +104,6 @@ struct fs_context {
unsigned int sb_flags; /* Proposed superblock flags (SB_*) */ unsigned int sb_flags; /* Proposed superblock flags (SB_*) */
unsigned int sb_flags_mask; /* Superblock flags that were changed */ unsigned int sb_flags_mask; /* Superblock flags that were changed */
unsigned int s_iflags; /* OR'd with sb->s_iflags */ unsigned int s_iflags; /* OR'd with sb->s_iflags */
unsigned int lsm_flags; /* Information flags from the fs to the LSM */
enum fs_context_purpose purpose:8; enum fs_context_purpose purpose:8;
enum fs_context_phase phase:8; /* The phase the context is in */ enum fs_context_phase phase:8; /* The phase the context is in */
bool need_free:1; /* Need to call ops->free() */ bool need_free:1; /* Need to call ops->free() */

2
include/linux/security.h
View file

@ -68,7 +68,7 @@ struct watch_notification;
/* If capable is being called by a setid function */ /* If capable is being called by a setid function */
#define CAP_OPT_INSETID BIT(2) #define CAP_OPT_INSETID BIT(2)
/* LSM Agnostic defines for fs_context::lsm_flags */ /* LSM Agnostic defines for security_sb_set_mnt_opts() flags */
#define SECURITY_LSM_NATIVE_LABELS 1 #define SECURITY_LSM_NATIVE_LABELS 1
struct ctl_table; struct ctl_table;