Skip to contentSkip to conversation

ovl: port to vfs{g,u}id_t and associated helpers

PATCH New Christian Brauner 1 participant 1 message Sep 9, 2022 Overlay filesystem

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ovl: port to vfs{g,u}id_t and associated helpers

A while ago we introduced a dedicated vfs{g,u}id_t type in commit 1e5267cd0895 ("mnt_idmapping: add vfs{g,u}id_t"). We already switched over a good part of the VFS. Ultimately we will remove all legacy idmapped mount helpers that operate only on k{g,u}id_t in favor of the new type safe helpers that operate on vfs{g,u}id_t.

Cc Seth Forshee (Digital Ocean) <[email protected]>
Cc Amir Goldstein <[email protected]>
Cc Christoph Hellwig <[email protected]>
Cc Miklos Szeredi <[email protected]>
---
 fs/overlayfs/util.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
fs/overlayfs/util.c +7 -2
index 87f811c089e4..40ea42c5100a 100644
@@ -1104,13 +1104,18 @@ void ovl_copyattr(struct inode *inode)
 	struct path realpath;
 	struct inode *realinode;
 	struct user_namespace *real_mnt_userns;
+	vfsuid_t vfsuid;
+	vfsgid_t vfsgid;
 
 	ovl_i_path_real(inode, &realpath);
 	realinode = d_inode(realpath.dentry);
 	real_mnt_userns = mnt_user_ns(realpath.mnt);
 
-	inode->i_uid = i_uid_into_mnt(real_mnt_userns, realinode);
-	inode->i_gid = i_gid_into_mnt(real_mnt_userns, realinode);
+	vfsuid = i_uid_into_vfsuid(real_mnt_userns, realinode);
+	vfsgid = i_gid_into_vfsgid(real_mnt_userns, realinode);
+
+	inode->i_uid = vfsuid_into_kuid(vfsuid);
+	inode->i_gid = vfsgid_into_kgid(vfsgid);
 	inode->i_mode = realinode->i_mode;
 	inode->i_atime = realinode->i_atime;
 	inode->i_mtime = realinode->i_mtime;

base-commit: 7e18e42e4b280c85b76967a9106a13ca61c16179

Signature · 1 line
2.34.1