diff options
author | Christian Brauner <brauner@kernel.org> | 2022-10-26 10:10:09 +0200 |
---|---|---|
committer | Christian Brauner (Microsoft) <brauner@kernel.org> | 2022-10-26 10:10:09 +0200 |
commit | e4236f97688afc21151bfc050acfce9ac3b56f6b (patch) | |
tree | a3b82c5501859b379c7e79c6e34a1df15aea8541 /include/linux/fs.h | |
parent | 03fd1402bd7d93bd4598fc961632ef2737a500fd (diff) | |
parent | eb7718cdb73c6b0c93002f8f73f4dd4701f8d2bb (diff) | |
download | linux-e4236f97688afc21151bfc050acfce9ac3b56f6b.tar.gz |
Merge branch 'fs.vfsuid.conversion' into for-next
Diffstat (limited to 'include/linux/fs.h')
-rw-r--r-- | include/linux/fs.h | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 21d16da5c54a0c..cffc402c2451fa 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1613,23 +1613,6 @@ static inline void i_gid_write(struct inode *inode, gid_t gid) } /** - * i_uid_into_mnt - map an inode's i_uid down into a mnt_userns - * @mnt_userns: user namespace of the mount the inode was found from - * @inode: inode to map - * - * Note, this will eventually be removed completely in favor of the type-safe - * i_uid_into_vfsuid(). - * - * Return: the inode's i_uid mapped down according to @mnt_userns. - * If the inode's i_uid has no mapping INVALID_UID is returned. - */ -static inline kuid_t i_uid_into_mnt(struct user_namespace *mnt_userns, - const struct inode *inode) -{ - return AS_KUIDT(make_vfsuid(mnt_userns, i_user_ns(inode), inode->i_uid)); -} - -/** * i_uid_into_vfsuid - map an inode's i_uid down into a mnt_userns * @mnt_userns: user namespace of the mount the inode was found from * @inode: inode to map @@ -1682,23 +1665,6 @@ static inline void i_uid_update(struct user_namespace *mnt_userns, } /** - * i_gid_into_mnt - map an inode's i_gid down into a mnt_userns - * @mnt_userns: user namespace of the mount the inode was found from - * @inode: inode to map - * - * Note, this will eventually be removed completely in favor of the type-safe - * i_gid_into_vfsgid(). - * - * Return: the inode's i_gid mapped down according to @mnt_userns. - * If the inode's i_gid has no mapping INVALID_GID is returned. - */ -static inline kgid_t i_gid_into_mnt(struct user_namespace *mnt_userns, - const struct inode *inode) -{ - return AS_KGIDT(make_vfsgid(mnt_userns, i_user_ns(inode), inode->i_gid)); -} - -/** * i_gid_into_vfsgid - map an inode's i_gid down into a mnt_userns * @mnt_userns: user namespace of the mount the inode was found from * @inode: inode to map |