|
 |
f742969 |
From 14977489ffdb80d4caf5a184ba41b23b02fbacd9 Mon Sep 17 00:00:00 2001
|
|
|
f742969 |
From: Trond Myklebust <Trond.Myklebust@netapp.com>
|
|
|
f742969 |
Date: Tue, 27 Mar 2012 18:31:25 -0400
|
|
|
f742969 |
Subject: [PATCH] NFSv4: Minor cleanups for nfs4_handle_exception and
|
|
|
f742969 |
nfs4_async_handle_error
|
|
|
f742969 |
|
|
|
f742969 |
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
|
|
|
f742969 |
---
|
|
|
f742969 |
fs/nfs/nfs4proc.c | 10 +++++-----
|
|
|
f742969 |
1 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
f742969 |
|
|
|
f742969 |
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
|
|
|
f742969 |
index 1933e67..f82bde0 100644
|
|
|
f742969 |
--- a/fs/nfs/nfs4proc.c
|
|
|
f742969 |
+++ b/fs/nfs/nfs4proc.c
|
|
|
f742969 |
@@ -270,7 +270,7 @@ static int nfs4_handle_exception(struct nfs_server *server, int errorcode, struc
|
|
|
f742969 |
case 0:
|
|
|
f742969 |
return 0;
|
|
|
f742969 |
case -NFS4ERR_OPENMODE:
|
|
|
f742969 |
- if (nfs_have_delegation(inode, FMODE_READ)) {
|
|
|
f742969 |
+ if (inode && nfs_have_delegation(inode, FMODE_READ)) {
|
|
|
f742969 |
nfs_inode_return_delegation(inode);
|
|
|
f742969 |
exception->retry = 1;
|
|
|
f742969 |
return 0;
|
|
|
f742969 |
@@ -282,10 +282,9 @@ static int nfs4_handle_exception(struct nfs_server *server, int errorcode, struc
|
|
|
f742969 |
case -NFS4ERR_DELEG_REVOKED:
|
|
|
f742969 |
case -NFS4ERR_ADMIN_REVOKED:
|
|
|
f742969 |
case -NFS4ERR_BAD_STATEID:
|
|
|
f742969 |
- if (state != NULL)
|
|
|
f742969 |
- nfs_remove_bad_delegation(state->inode);
|
|
|
f742969 |
if (state == NULL)
|
|
|
f742969 |
break;
|
|
|
f742969 |
+ nfs_remove_bad_delegation(state->inode);
|
|
|
f742969 |
nfs4_schedule_stateid_recovery(server, state);
|
|
|
f742969 |
goto wait_on_recovery;
|
|
|
f742969 |
case -NFS4ERR_EXPIRED:
|
|
|
f742969 |
@@ -3825,8 +3824,9 @@ nfs4_async_handle_error(struct rpc_task *task, const struct nfs_server *server,
|
|
|
f742969 |
case -NFS4ERR_DELEG_REVOKED:
|
|
|
f742969 |
case -NFS4ERR_ADMIN_REVOKED:
|
|
|
f742969 |
case -NFS4ERR_BAD_STATEID:
|
|
|
f742969 |
- if (state != NULL)
|
|
|
f742969 |
- nfs_remove_bad_delegation(state->inode);
|
|
|
f742969 |
+ if (state == NULL)
|
|
|
f742969 |
+ break;
|
|
|
f742969 |
+ nfs_remove_bad_delegation(state->inode);
|
|
|
f742969 |
case -NFS4ERR_OPENMODE:
|
|
|
f742969 |
if (state == NULL)
|
|
|
f742969 |
break;
|
|
|
f742969 |
--
|
|
|
f742969 |
1.7.7.6
|
|
|
f742969 |
|