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

Commit 3660cd43 authored by Andy Adamson's avatar Andy Adamson Committed by Trond Myklebust
Browse files

NFSv4 Remove zeroing state kern warnings 



As of commit 5d422301 we no longer zero the
state.

Signed-off-by: default avatarAndy Adamson <andros@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 561ec160

fs/nfs/nfs4state.c

+5 −8
Original line number Diff line number Diff line
@@ -1375,8 +1375,8 @@ static int nfs4_reclaim_locks(struct nfs4_state *state, const struct nfs4_state_ 
			case -NFS4ERR_CONN_NOT_BOUND_TO_SESSION:

				goto out;

			default:

				printk(KERN_ERR "NFS: %s: unhandled error %d. "

					"Zeroing state\n", __func__, status);

				printk(KERN_ERR "NFS: %s: unhandled error %d\n",

					 __func__, status);

			case -ENOMEM:

			case -NFS4ERR_DENIED:

			case -NFS4ERR_RECLAIM_BAD:
@@ -1439,15 +1439,12 @@ static int nfs4_reclaim_open_state(struct nfs4_state_owner *sp, const struct nfs 
		}

		switch (status) {

			default:

				printk(KERN_ERR "NFS: %s: unhandled error %d. "

					"Zeroing state\n", __func__, status);

				printk(KERN_ERR "NFS: %s: unhandled error %d\n",

					__func__, status);

			case -ENOENT:

			case -ENOMEM:

			case -ESTALE:

				/*

				 * Open state on this file cannot be recovered

				 * All we can do is revert to using the zero stateid.

				 */

				/* Open state on this file cannot be recovered */

				nfs4_state_mark_recovery_failed(state, status);

				break;

			case -EAGAIN: