diff options
author | Andy Adamson <andros@netapp.com> | 2013-10-03 12:23:24 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2013-10-28 14:28:53 -0400 |
commit | 3660cd4322fce986689b06225d9c12d77193c252 (patch) | |
tree | 129a4b8f6c4aa1c4a84ad60d86f033d1b5242264 /fs/nfs/nfs4state.c | |
parent | 561ec1603171cd9b38dcf6cac53e8710f437a48d (diff) |
NFSv4 Remove zeroing state kern warnings
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>
Diffstat (limited to 'fs/nfs/nfs4state.c')
-rw-r--r-- | fs/nfs/nfs4state.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c index cc14cbb78b73..fa2706a4225a 100644 --- a/fs/nfs/nfs4state.c +++ b/fs/nfs/nfs4state.c | |||
@@ -1375,8 +1375,8 @@ static int nfs4_reclaim_locks(struct nfs4_state *state, const struct nfs4_state_ | |||
1375 | case -NFS4ERR_CONN_NOT_BOUND_TO_SESSION: | 1375 | case -NFS4ERR_CONN_NOT_BOUND_TO_SESSION: |
1376 | goto out; | 1376 | goto out; |
1377 | default: | 1377 | default: |
1378 | printk(KERN_ERR "NFS: %s: unhandled error %d. " | 1378 | printk(KERN_ERR "NFS: %s: unhandled error %d\n", |
1379 | "Zeroing state\n", __func__, status); | 1379 | __func__, status); |
1380 | case -ENOMEM: | 1380 | case -ENOMEM: |
1381 | case -NFS4ERR_DENIED: | 1381 | case -NFS4ERR_DENIED: |
1382 | case -NFS4ERR_RECLAIM_BAD: | 1382 | case -NFS4ERR_RECLAIM_BAD: |
@@ -1439,15 +1439,12 @@ restart: | |||
1439 | } | 1439 | } |
1440 | switch (status) { | 1440 | switch (status) { |
1441 | default: | 1441 | default: |
1442 | printk(KERN_ERR "NFS: %s: unhandled error %d. " | 1442 | printk(KERN_ERR "NFS: %s: unhandled error %d\n", |
1443 | "Zeroing state\n", __func__, status); | 1443 | __func__, status); |
1444 | case -ENOENT: | 1444 | case -ENOENT: |
1445 | case -ENOMEM: | 1445 | case -ENOMEM: |
1446 | case -ESTALE: | 1446 | case -ESTALE: |
1447 | /* | 1447 | /* Open state on this file cannot be recovered */ |
1448 | * Open state on this file cannot be recovered | ||
1449 | * All we can do is revert to using the zero stateid. | ||
1450 | */ | ||
1451 | nfs4_state_mark_recovery_failed(state, status); | 1448 | nfs4_state_mark_recovery_failed(state, status); |
1452 | break; | 1449 | break; |
1453 | case -EAGAIN: | 1450 | case -EAGAIN: |