]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
nfsd4: kill warnings on testing stateids with mismatched clientids
authorJ. Bruce Fields <bfields@redhat.com>
Thu, 19 Mar 2020 14:18:49 +0000 (10:18 -0400)
committerChuck Lever <chuck.lever@oracle.com>
Thu, 19 Mar 2020 14:51:42 +0000 (10:51 -0400)
It's normal for a client to test a stateid from a previous instance,
e.g. after a network partition.

Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Reviewed-by: Benjamin Coddington <bcodding@redhat.com>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
fs/nfsd/nfs4state.c

index 3a24b3c328c334d22d347e289786fb97945ffe08..e32ecedece0feb808567c92c1137ddcb20537d85 100644 (file)
@@ -5531,15 +5531,8 @@ static __be32 nfsd4_validate_stateid(struct nfs4_client *cl, stateid_t *stateid)
        if (ZERO_STATEID(stateid) || ONE_STATEID(stateid) ||
                CLOSE_STATEID(stateid))
                return status;
-       /* Client debugging aid. */
-       if (!same_clid(&stateid->si_opaque.so_clid, &cl->cl_clientid)) {
-               char addr_str[INET6_ADDRSTRLEN];
-               rpc_ntop((struct sockaddr *)&cl->cl_addr, addr_str,
-                                sizeof(addr_str));
-               pr_warn_ratelimited("NFSD: client %s testing state ID "
-                                       "with incorrect client ID\n", addr_str);
+       if (!same_clid(&stateid->si_opaque.so_clid, &cl->cl_clientid))
                return status;
-       }
        spin_lock(&cl->cl_lock);
        s = find_stateid_locked(cl, stateid);
        if (!s)