From adecd8eeae57976ca44c0df96c3948b663464103 Mon Sep 17 00:00:00 2001 From: Jaegeuk Kim Date: Wed, 4 Jan 2023 12:59:53 -0800 Subject: [PATCH] Revert "fs: add i_user_ns() helper" This reverts commit cab74ea1a775d27f42ba45d68554a904ce22a4a2. --- include/linux/fs.h | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/include/linux/fs.h b/include/linux/fs.h index 0d1bfe570a80..c7856816df45 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1602,11 +1602,6 @@ 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 @@ -1614,22 +1609,22 @@ static inline struct user_namespace *i_user_ns(const struct inode *inode) */ static inline uid_t i_uid_read(const struct inode *inode) { - return from_kuid(i_user_ns(inode), inode->i_uid); + return from_kuid(inode->i_sb->s_user_ns, inode->i_uid); } static inline gid_t i_gid_read(const struct inode *inode) { - return from_kgid(i_user_ns(inode), inode->i_gid); + return from_kgid(inode->i_sb->s_user_ns, inode->i_gid); } static inline void i_uid_write(struct inode *inode, uid_t uid) { - inode->i_uid = make_kuid(i_user_ns(inode), uid); + inode->i_uid = make_kuid(inode->i_sb->s_user_ns, uid); } static inline void i_gid_write(struct inode *inode, gid_t gid) { - inode->i_gid = make_kgid(i_user_ns(inode), gid); + inode->i_gid = make_kgid(inode->i_sb->s_user_ns, gid); } /**