This is a note to let you know that I've just added the patch titled
fs: add i_user_ns() helper
to the 5.15-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
fs-add-i_user_ns-helper.patch
and it can be found in the queue-5.15 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From foo@baz Thu Jun 30 01:35:30 PM CEST 2022
From: Christian Brauner <brauner@xxxxxxxxxx>
Date: Tue, 28 Jun 2022 14:16:17 +0200
Subject: fs: add i_user_ns() helper
To: Greg KH <gregkh@xxxxxxxxxxxxxxxxxxx>
Cc: Christian Brauner <christian.brauner@xxxxxxxxxx>, stable@xxxxxxxxxxxxxxx
Message-ID: <20220628121620.188722-10-brauner@xxxxxxxxxx>
From: Christian Brauner <christian.brauner@xxxxxxxxxx>
commit a1ec9040a2a9122605ac26e5725c6de019184419 upstream.
Since we'll be passing the filesystem's idmapping in even more places in
the following patches and we do already dereference struct inode to get
to the filesystem's idmapping multiple times add a tiny helper.
Link: https://lore.kernel.org/r/20211123114227.3124056-10-brauner@xxxxxxxxxx (v1)
Link: https://lore.kernel.org/r/20211130121032.3753852-10-brauner@xxxxxxxxxx (v2)
Link: https://lore.kernel.org/r/20211203111707.3901969-10-brauner@xxxxxxxxxx
Cc: Seth Forshee <sforshee@xxxxxxxxxxxxxxxx>
Cc: Christoph Hellwig <hch@xxxxxx>
Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
CC: linux-fsdevel@xxxxxxxxxxxxxxx
Reviewed-by: Amir Goldstein <amir73il@xxxxxxxxx>
Reviewed-by: Seth Forshee <sforshee@xxxxxxxxxxxxxxxx>
Signed-off-by: Christian Brauner <christian.brauner@xxxxxxxxxx>
Signed-off-by: Christian Brauner (Microsoft) <brauner@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
include/linux/fs.h | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1602,6 +1602,11 @@ struct super_block {
struct list_head s_inodes_wb; /* writeback inodes */
} __randomize_layout;
+static inline struct user_namespace *i_user_ns(const struct inode *inode)
+{
+ return inode->i_sb->s_user_ns;
+}
+
/* Helper functions so that in most cases filesystems will
* not need to deal directly with kuid_t and kgid_t and can
* instead deal with the raw numeric values that are stored
@@ -1609,22 +1614,22 @@ struct super_block {
*/
static inline uid_t i_uid_read(const struct inode *inode)
{
- return from_kuid(inode->i_sb->s_user_ns, inode->i_uid);
+ return from_kuid(i_user_ns(inode), inode->i_uid);
}
static inline gid_t i_gid_read(const struct inode *inode)
{
- return from_kgid(inode->i_sb->s_user_ns, inode->i_gid);
+ return from_kgid(i_user_ns(inode), inode->i_gid);
}
static inline void i_uid_write(struct inode *inode, uid_t uid)
{
- inode->i_uid = make_kuid(inode->i_sb->s_user_ns, uid);
+ inode->i_uid = make_kuid(i_user_ns(inode), uid);
}
static inline void i_gid_write(struct inode *inode, gid_t gid)
{
- inode->i_gid = make_kgid(inode->i_sb->s_user_ns, gid);
+ inode->i_gid = make_kgid(i_user_ns(inode), gid);
}
/**
Patches currently in stable-queue which might be from brauner@xxxxxxxxxx are
queue-5.15/fs-account-for-group-membership.patch
queue-5.15/fs-use-low-level-mapping-helpers.patch
queue-5.15/fs-move-mapping-helpers.patch
queue-5.15/fs-remove-unused-low-level-mapping-helpers.patch
queue-5.15/fs-tweak-fsuidgid_has_mapping.patch
queue-5.15/fs-add-i_user_ns-helper.patch
queue-5.15/fs-add-is_idmapped_mnt-helper.patch
queue-5.15/fs-support-mapped-mounts-of-mapped-filesystems.patch
queue-5.15/fs-fix-acl-translation.patch
queue-5.15/fs-port-higher-level-mapping-helpers.patch
queue-5.15/docs-update-mapping-documentation.patch
queue-5.15/fs-account-for-filesystem-mappings.patch
