From: Christian Brauner <brauner@kernel.org>
Date: Wed, 29 Jun 2022 10:25:53 +0000 (+0200)
Subject: fs: port HAS_UNMAPPED_ID() to vfs{g,u}id_t
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9adf24a40978c19f57f44572b292b38938da7686;p=linux.git

fs: port HAS_UNMAPPED_ID() to vfs{g,u}id_t

The HAS_UNMAPPED_ID() helper is fully self contained so we can port it
to vfs{g,u}id_t without much effort.

Cc: Seth Forshee <sforshee@digitalocean.com>
Signed-off-by: Christian Brauner (Microsoft) <brauner@kernel.org>
---

diff --git a/include/linux/fs.h b/include/linux/fs.h
index d6e3347cbf692..ec2e358867793 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2323,8 +2323,8 @@ static inline bool sb_rdonly(const struct super_block *sb) { return sb->s_flags
 static inline bool HAS_UNMAPPED_ID(struct user_namespace *mnt_userns,
 				   struct inode *inode)
 {
-	return !uid_valid(i_uid_into_mnt(mnt_userns, inode)) ||
-	       !gid_valid(i_gid_into_mnt(mnt_userns, inode));
+	return !vfsuid_valid(i_uid_into_vfsuid(mnt_userns, inode)) ||
+	       !vfsgid_valid(i_gid_into_vfsgid(mnt_userns, inode));
 }
 
 static inline int iocb_flags(struct file *file);