2 files changed, 6 insertions, 5 deletions

diff --git a/include/linux/sunrpc/auth.h b/include/linux/sunrpc/auth.h
index f25ba922baaf..58fda1c3c783 100644
--- a/include/linux/sunrpc/auth.h
+++ b/include/linux/sunrpc/auth.h
@@ -17,14 +17,15 @@
 
 #include <linux/atomic.h>
 #include <linux/rcupdate.h>
+#include <linux/uidgid.h>
 
 /* size of the nodename buffer */
 #define UNX_MAXNODENAME 32
 
 /* Work around the lack of a VFS credential */
 struct auth_cred {
-        uid_t   uid;
-        gid_t   gid;
+        kuid_t  uid;
+        kgid_t  gid;
         struct group_info *group_info;
         const char *principal;
         unsigned char machine_cred : 1;
@@ -48,7 +49,7 @@ struct rpc_cred {
         unsigned long           cr_flags;       /* various flags */
         atomic_t                cr_count;       /* ref count */
 
-        uid_t                   cr_uid;
+        kuid_t                  cr_uid;
 
         /* per-flavor data */
 };
diff --git a/include/linux/sunrpc/svcauth.h b/include/linux/sunrpc/svcauth.h
index dd74084a9799..ff374ab30839 100644
--- a/include/linux/sunrpc/svcauth.h
+++ b/include/linux/sunrpc/svcauth.h
@@ -18,8 +18,8 @@
 #include <linux/cred.h>
 
 struct svc_cred {
-        uid_t                   cr_uid;
-        gid_t                   cr_gid;
+        kuid_t                  cr_uid;
+        kgid_t                  cr_gid;
         struct group_info       *cr_group_info;
         u32                     cr_flavor; /* pseudoflavor */
         char                    *cr_principal; /* for gss */