NFSv4: Fix stateid recovery on revoked delegations
Ensure that we fix the non-NULL stateid case as well. Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
This commit is contained in:
parent
ae2ffef383
commit
5ba12443a1
|
@ -356,6 +356,9 @@ int nfs4_handle_exception(struct nfs_server *server, int errorcode, struct nfs4_
|
||||||
case 0:
|
case 0:
|
||||||
return 0;
|
return 0;
|
||||||
case -NFS4ERR_OPENMODE:
|
case -NFS4ERR_OPENMODE:
|
||||||
|
case -NFS4ERR_DELEG_REVOKED:
|
||||||
|
case -NFS4ERR_ADMIN_REVOKED:
|
||||||
|
case -NFS4ERR_BAD_STATEID:
|
||||||
if (inode && nfs4_have_delegation(inode, FMODE_READ)) {
|
if (inode && nfs4_have_delegation(inode, FMODE_READ)) {
|
||||||
nfs4_inode_return_delegation(inode);
|
nfs4_inode_return_delegation(inode);
|
||||||
exception->retry = 1;
|
exception->retry = 1;
|
||||||
|
@ -367,21 +370,6 @@ int nfs4_handle_exception(struct nfs_server *server, int errorcode, struct nfs4_
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
break;
|
break;
|
||||||
goto wait_on_recovery;
|
goto wait_on_recovery;
|
||||||
case -NFS4ERR_DELEG_REVOKED:
|
|
||||||
case -NFS4ERR_ADMIN_REVOKED:
|
|
||||||
case -NFS4ERR_BAD_STATEID:
|
|
||||||
if (state == NULL) {
|
|
||||||
if (inode && nfs4_have_delegation(inode,
|
|
||||||
FMODE_READ)) {
|
|
||||||
nfs4_inode_return_delegation(inode);
|
|
||||||
exception->retry = 1;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
ret = nfs4_schedule_stateid_recovery(server, state);
|
|
||||||
if (ret < 0)
|
|
||||||
break;
|
|
||||||
goto wait_on_recovery;
|
|
||||||
case -NFS4ERR_EXPIRED:
|
case -NFS4ERR_EXPIRED:
|
||||||
if (state != NULL) {
|
if (state != NULL) {
|
||||||
ret = nfs4_schedule_stateid_recovery(server, state);
|
ret = nfs4_schedule_stateid_recovery(server, state);
|
||||||
|
|
Loading…
Reference in a new issue