NFSv4 Remove zeroing state kern warnings
authorAndy Adamson <andros@netapp.com>
Thu, 3 Oct 2013 16:23:24 +0000 (12:23 -0400)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Mon, 28 Oct 2013 18:28:53 +0000 (14:28 -0400)
As of commit 5d422301f97b821301efcdb6fc9d1a83a5c102d6 we no longer zero the
state.

Signed-off-by: Andy Adamson <andros@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
fs/nfs/nfs4state.c

index cc14cbb78b7322637ae74f6ad013c9183e7a996a..fa2706a4225acb1224883dffa0651888d2c322e5 100644 (file)
@@ -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 @@ restart:
                }
                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: