sunrpc: Simplify auth_unix now that everything is a kgid_t

[~andy/linux] / net / sunrpc / auth_unix.c

diff --git a/net/sunrpc/auth_unix.c b/net/sunrpc/auth_unix.c
index 52c5abdee211cde762075809a09ca2d849ddeca3..9f3885745fb3ebd62d77844c7493192d3f570024 100644 (file)
--- a/net/sunrpc/auth_unix.c
+++ b/net/sunrpc/auth_unix.c
@@ -18,8 +18,8 @@
 
 struct unx_cred {
        struct rpc_cred         uc_base;
-       gid_t                   uc_gid;
-       gid_t                   uc_gids[NFS_NGROUPS];
+       kgid_t                  uc_gid;
+       kgid_t                  uc_gids[NFS_NGROUPS];
 };
 #define uc_uid                 uc_base.cr_uid
 
@@ -79,13 +79,10 @@ unx_create_cred(struct rpc_auth *auth, struct auth_cred *acred, int flags)
                groups = NFS_NGROUPS;
 
        cred->uc_gid = acred->gid;
-       for (i = 0; i < groups; i++) {
-               gid_t gid;
-               gid = from_kgid(&init_user_ns, GROUP_AT(acred->group_info, i));
-               cred->uc_gids[i] = gid;
-       }
+       for (i = 0; i < groups; i++)
+               cred->uc_gids[i] = GROUP_AT(acred->group_info, i);
        if (i < NFS_NGROUPS)
-               cred->uc_gids[i] = NOGROUP;
+               cred->uc_gids[i] = INVALID_GID;
 
        return &cred->uc_base;
 }
@@ -123,21 +120,18 @@ unx_match(struct auth_cred *acred, struct rpc_cred *rcred, int flags)
        unsigned int i;
 
 
-       if (cred->uc_uid != acred->uid || cred->uc_gid != acred->gid)
+       if (!uid_eq(cred->uc_uid, acred->uid) || !gid_eq(cred->uc_gid, acred->gid))
                return 0;
 
        if (acred->group_info != NULL)
                groups = acred->group_info->ngroups;
        if (groups > NFS_NGROUPS)
                groups = NFS_NGROUPS;
-       for (i = 0; i < groups ; i++) {
-               gid_t gid;
-               gid = from_kgid(&init_user_ns, GROUP_AT(acred->group_info, i));
-               if (cred->uc_gids[i] != gid)
+       for (i = 0; i < groups ; i++)
+               if (!gid_eq(cred->uc_gids[i], GROUP_AT(acred->group_info, i)))
                        return 0;
-       }
        if (groups < NFS_NGROUPS &&
-           cred->uc_gids[groups] != NOGROUP)
+           cred->uc_gids[groups] != INVALID_GID)
                return 0;
        return 1;
 }
@@ -166,7 +160,7 @@ unx_marshal(struct rpc_task *task, __be32 *p)
        *p++ = htonl((u32) cred->uc_uid);
        *p++ = htonl((u32) cred->uc_gid);
        hold = p++;
-       for (i = 0; i < 16 && cred->uc_gids[i] != (gid_t) NOGROUP; i++)
+       for (i = 0; i < 16 && cred->uc_gids[i] != INVALID_GID; i++)
                *p++ = htonl((u32) cred->uc_gids[i]);
        *hold = htonl(p - hold - 1);            /* gid array length */
        *base = htonl((p - base - 1) << 2);     /* cred length */