projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6c2d8f8
)
NFSv4: nfs4_handle_delegation_recall_error() handle expiration as revoke case
author
Trond Myklebust
<
[email protected]
>
Thu, 22 Sep 2016 17:39:08 +0000
(13:39 -0400)
committer
Anna Schumaker
<
[email protected]
>
Tue, 27 Sep 2016 18:34:38 +0000
(14:34 -0400)
If the server tells us our stateid has expired, then handle that as if
it was revoked.
Signed-off-by: Trond Myklebust <
[email protected]
>
Tested-by: Oleg Drokin <
[email protected]
>
Signed-off-by: Anna Schumaker <
[email protected]
>
fs/nfs/nfs4proc.c
patch
|
blob
|
history
diff --git
a/fs/nfs/nfs4proc.c
b/fs/nfs/nfs4proc.c
index ee1fd4c5e646da7e5d5bbe1c9200c86bce3197f8..89887f15946e4b9d8b74e00ad00a12bb6bb262f8 100644
(file)
--- a/
fs/nfs/nfs4proc.c
+++ b/
fs/nfs/nfs4proc.c
@@
-1919,7
+1919,6
@@
static int nfs4_handle_delegation_recall_error(struct nfs_server *server, struct
case -NFS4ERR_STALE_CLIENTID:
case -NFS4ERR_STALE_STATEID:
set_bit(NFS_DELEGATED_STATE, &state->flags);
- case -NFS4ERR_EXPIRED:
/* Don't recall a delegation if it was lost */
nfs4_schedule_lease_recovery(server->nfs_client);
return -EAGAIN;
@@
-1931,6
+1930,7
@@
static int nfs4_handle_delegation_recall_error(struct nfs_server *server, struct
return -EAGAIN;
case -NFS4ERR_DELEG_REVOKED:
case -NFS4ERR_ADMIN_REVOKED:
+ case -NFS4ERR_EXPIRED:
case -NFS4ERR_BAD_STATEID:
case -NFS4ERR_OPENMODE:
nfs_inode_find_state_and_recover(state->inode,