userns: Store uid and gid values in struct cred with kuid_t and kgid_t types

[deliverable/linux.git] / include / linux / user_namespace.h

diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h
index 4c9846d9074195ec6598bc3dca161e2f4524d572..a2c61457cba14b908bad8bfb52eac4abd612135f 100644 (file)
--- a/include/linux/user_namespace.h
+++ b/include/linux/user_namespace.h
@@ -70,15 +70,15 @@ static inline void put_user_ns(struct user_namespace *ns)
 #endif
 
 static inline uid_t user_ns_map_uid(struct user_namespace *to,
-       const struct cred *cred, uid_t uid)
+       const struct cred *cred, kuid_t uid)
 {
-       return from_kuid_munged(to, make_kuid(cred->user_ns, uid));
+       return from_kuid_munged(to, uid);
 }
 
 static inline gid_t user_ns_map_gid(struct user_namespace *to,
-       const struct cred *cred, gid_t gid)
+       const struct cred *cred, kgid_t gid)
 {
-       return from_kgid_munged(to, make_kgid(cred->user_ns, gid));
+       return from_kgid_munged(to, gid);
 }
 
 #endif /* _LINUX_USER_H */