summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorOndrej Mosnacek <omosnace@redhat.com>2023-03-16 14:07:51 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2026-01-19 13:11:37 +0100
commit48158cab0e131442e20868c26756321ae4c9e030 (patch)
tree5b5a8c3193ccdebbd3bf1d8b74ac61e6a2c58a03 /include
parentccfb628ddb7da8df74a5c383c67704fe74694691 (diff)
fs_context: drop the unused lsm_flags member
[ Upstream commit 4e04143c869c5b6d499fbd5083caa860d5c942c3 ] 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> Stable-dep-of: 8675c69816e4 ("NFS: Automounted filesystems should inherit ro,noexec,nodev,sync flags") Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/fs_context.h1
-rw-r--r--include/linux/security.h2
2 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/fs_context.h b/include/linux/fs_context.h
index 40dd74bdd9fb..9229ac6a5326 100644
--- a/include/linux/fs_context.h
+++ b/include/linux/fs_context.h
@@ -104,7 +104,6 @@ struct fs_context {
unsigned int sb_flags; /* Proposed superblock flags (SB_*) */
unsigned int sb_flags_mask; /* Superblock flags that were changed */
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_phase phase:8; /* The phase the context is in */
bool need_free:1; /* Need to call ops->free() */
diff --git a/include/linux/security.h b/include/linux/security.h
index e32e040f094c..c75dd495be77 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -68,7 +68,7 @@ struct watch_notification;
/* If capable is being called by a setid function */
#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
struct ctl_table;