Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4e3c4cd authored by J. Bruce Fields's avatar J. Bruce Fields Committed by Greg Kroah-Hartman
Browse files

nfsd4: kill warnings on testing stateids with mismatched clientids 



[ Upstream commit 663e36f07666ff924012defa521f88875f6e5402 ]

It's normal for a client to test a stateid from a previous instance,
e.g. after a network partition.

Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
Reviewed-by: default avatarBenjamin Coddington <bcodding@redhat.com>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Stable-dep-of: f75546f58a70 ("nfsd: Remove incorrect check in nfsd4_validate_stateid")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent ff652b01

fs/nfsd/nfs4state.c

+1 −8
Original line number Diff line number Diff line
@@ -5513,15 +5513,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)