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

Commit 9a3ba432 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4: Rate limit the state manager warning messages 



Prevent the state manager from filling up system logs when recovery
fails on the server.

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
Cc: stable@vger.kernel.org
parent 0097143c

fs/nfs/callback_xdr.c

+3 −1
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ 
#include <linux/sunrpc/svc.h>

#include <linux/nfs4.h>

#include <linux/nfs_fs.h>

#include <linux/ratelimit.h>

#include <linux/printk.h>

#include <linux/slab.h>

#include <linux/sunrpc/bc_xprt.h>

#include "nfs4_fs.h"
@@ -167,7 +169,7 @@ static __be32 decode_compound_hdr_arg(struct xdr_stream *xdr, struct cb_compound 
	if (hdr->minorversion <= 1) {

		hdr->cb_ident = ntohl(*p++); /* ignored by v4.1 */

	} else {

		printk(KERN_WARNING "NFS: %s: NFSv4 server callback with "

		pr_warn_ratelimited("NFS: %s: NFSv4 server callback with "

			"illegal minor version %u!\n",

			__func__, hdr->minorversion);

		return htonl(NFS4ERR_MINOR_VERS_MISMATCH);

fs/nfs/nfs4proc.c

+1 −1
Original line number Diff line number Diff line
@@ -1876,7 +1876,7 @@ static struct nfs4_state *nfs4_do_open(struct inode *dir, struct dentry *dentry, 
		 * the user though...

		 */

		if (status == -NFS4ERR_BAD_SEQID) {

			printk(KERN_WARNING "NFS: v4 server %s "

			pr_warn_ratelimited("NFS: v4 server %s "

					" returned a bad sequence-id error!\n",

					NFS_SERVER(dir)->nfs_client->cl_hostname);

			exception.retry = 1;

fs/nfs/nfs4state.c

+2 −2
Original line number Diff line number Diff line
@@ -984,7 +984,7 @@ static void nfs_increment_seqid(int status, struct nfs_seqid *seqid) 
		case -NFS4ERR_BAD_SEQID:

			if (seqid->sequence->flags & NFS_SEQID_CONFIRMED)

				return;

			printk(KERN_WARNING "NFS: v4 server returned a bad"

			pr_warn_ratelimited("NFS: v4 server returned a bad"

					" sequence-id error on an"

					" unconfirmed sequence %p!\n",

					seqid->sequence);
@@ -1840,7 +1840,7 @@ static void nfs4_state_manager(struct nfs_client *clp) 
	} while (atomic_read(&clp->cl_count) > 1);

	return;

out_error:

	printk(KERN_WARNING "NFS: state manager failed on NFSv4 server %s"

	pr_warn_ratelimited("NFS: state manager failed on NFSv4 server %s"

			" with error %d\n", clp->cl_hostname, -status);

	nfs4_end_drain_session(clp);

	nfs4_clear_state_manager_bit(clp);