diff options
| author | Mark Brown <broonie@kernel.org> | 2026-09-30 11:58:30 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-09-30 11:58:30 +0100 |
| commit | 5eb3fdca6ca7667a73d52adfd047d94e8b8b105e (patch) | |
| tree | c935b3fa5b47c9d70e0e66c7cc7830e74988b13f /include/linux/mount.h | |
| parent | f60deca1c3741ab8fcf318a7bb82a3d026ea7c49 (diff) | |
| parent | 84086827932b58e7645d93d970bbc566c4ee408b (diff) | |
| download | linux-next-5eb3fdca6ca7667a73d52adfd047d94e8b8b105e.tar.gz linux-next-5eb3fdca6ca7667a73d52adfd047d94e8b8b105e.zip | |
Merge branch 'vfs.all' of https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git
# Conflicts:
# fs/smb/server/smb2pdu.c
# fs/smb/server/vfs.c
# fs/smb/server/vfs.h
Diffstat (limited to 'include/linux/mount.h')
| -rw-r--r-- | include/linux/mount.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/mount.h b/include/linux/mount.h index acfe7ef86a1b..e90ccafef281 100644 --- a/include/linux/mount.h +++ b/include/linux/mount.h @@ -59,10 +59,10 @@ struct vfsmount { struct dentry *mnt_root; /* root of the mounted tree */ struct super_block *mnt_sb; /* pointer to superblock */ int mnt_flags; - struct mnt_idmap *mnt_idmap; + const struct mnt_idmap *mnt_idmap; } __randomize_layout; -static inline struct mnt_idmap *mnt_idmap(const struct vfsmount *mnt) +static inline const struct mnt_idmap *mnt_idmap(const struct vfsmount *mnt) { /* Pairs with smp_store_release() in do_idmap_mount(). */ return READ_ONCE(mnt->mnt_idmap); |