1 files changed, 2 insertions, 4 deletions

diff --git a/net/sunrpc/svcauth_unix.c b/net/sunrpc/svcauth_unix.c
index 06bdf5a1082c..621ca7b4a155 100644
--- a/net/sunrpc/svcauth_unix.c
+++ b/net/sunrpc/svcauth_unix.c
@@ -347,13 +347,13 @@ ip_map_cached_get(struct svc_xprt *xprt)
                 spin_lock(&xprt->xpt_lock);
                 ipm = xprt->xpt_auth_cache;
                 if (ipm != NULL) {
-                        if (!cache_valid(&ipm->h)) {
+                        sn = net_generic(xprt->xpt_net, sunrpc_net_id);
+                        if (cache_is_expired(sn->ip_map_cache, &ipm->h)) {
                                 /*
                                  * The entry has been invalidated since it was
                                  * remembered, e.g. by a second mount from the
                                  * same IP address.
                                  */
-                                sn = net_generic(xprt->xpt_net, sunrpc_net_id);
                                 xprt->xpt_auth_cache = NULL;
                                 spin_unlock(&xprt->xpt_lock);
                                 cache_put(&ipm->h, sn->ip_map_cache);
@@ -493,8 +493,6 @@ static int unix_gid_parse(struct cache_detail *cd,
         if (rv)
                 return -EINVAL;
         uid = make_kuid(&init_user_ns, id);
-        if (!uid_valid(uid))
-                return -EINVAL;
         ug.uid = uid;
 
         expiry = get_expiry(&mesg);