Merge tag 'nfs-for-4.9-1' of git://git.linux-nfs.org/projects/anna/linux-nfs

[cascardo/linux.git] / net / sunrpc / auth_unix.c

diff --git a/net/sunrpc/auth_unix.c b/net/sunrpc/auth_unix.c
index 4c0c572..306fc0f 100644 (file)
--- a/net/sunrpc/auth_unix.c
+++ b/net/sunrpc/auth_unix.c
@@ -87,7 +87,7 @@ unx_create_cred(struct rpc_auth *auth, struct auth_cred *acred, int flags, gfp_t
 
        cred->uc_gid = acred->gid;
        for (i = 0; i < groups; i++)
 
        cred->uc_gid = acred->gid;
        for (i = 0; i < groups; i++)

-               cred->uc_gids[i] = GROUP_AT(acred->group_info, i);
+               cred->uc_gids[i] = acred->group_info->gid[i];

        if (i < NFS_NGROUPS)
                cred->uc_gids[i] = INVALID_GID;
 
        if (i < NFS_NGROUPS)
                cred->uc_gids[i] = INVALID_GID;
 


@@ -135,7 +135,7 @@ unx_match(struct auth_cred *acred, struct rpc_cred *rcred, int flags)
        if (groups > NFS_NGROUPS)
                groups = NFS_NGROUPS;
        for (i = 0; i < groups ; i++)
        if (groups > NFS_NGROUPS)
                groups = NFS_NGROUPS;
        for (i = 0; i < groups ; i++)

-               if (!gid_eq(cred->uc_gids[i], GROUP_AT(acred->group_info, i)))
+               if (!gid_eq(cred->uc_gids[i], acred->group_info->gid[i]))

                        return 0;
        if (groups < NFS_NGROUPS && gid_valid(cred->uc_gids[groups]))
                return 0;
                        return 0;
        if (groups < NFS_NGROUPS && gid_valid(cred->uc_gids[groups]))
                return 0;