mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-25 10:19:47 +00:00
NFSv4: Fix the setlk error handler
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
parent
b4410c2f7f
commit
ecac799a5e
1 changed files with 4 additions and 9 deletions
|
@ -4173,23 +4173,18 @@ static const struct rpc_call_ops nfs4_recover_lock_ops = {
|
|||
|
||||
static void nfs4_handle_setlk_error(struct nfs_server *server, struct nfs4_lock_state *lsp, int new_lock_owner, int error)
|
||||
{
|
||||
struct nfs_client *clp = server->nfs_client;
|
||||
struct nfs4_state *state = lsp->ls_state;
|
||||
|
||||
switch (error) {
|
||||
case -NFS4ERR_ADMIN_REVOKED:
|
||||
case -NFS4ERR_BAD_STATEID:
|
||||
case -NFS4ERR_EXPIRED:
|
||||
lsp->ls_seqid.flags &= ~NFS_SEQID_CONFIRMED;
|
||||
if (new_lock_owner != 0 ||
|
||||
(lsp->ls_flags & NFS_LOCK_INITIALIZED) != 0)
|
||||
nfs4_state_mark_reclaim_nograce(clp, state);
|
||||
lsp->ls_seqid.flags &= ~NFS_SEQID_CONFIRMED;
|
||||
nfs4_schedule_stateid_recovery(server, lsp->ls_state);
|
||||
break;
|
||||
case -NFS4ERR_STALE_STATEID:
|
||||
if (new_lock_owner != 0 ||
|
||||
(lsp->ls_flags & NFS_LOCK_INITIALIZED) != 0)
|
||||
nfs4_state_mark_reclaim_reboot(clp, state);
|
||||
lsp->ls_seqid.flags &= ~NFS_SEQID_CONFIRMED;
|
||||
case -NFS4ERR_EXPIRED:
|
||||
nfs4_schedule_lease_recovery(server->nfs_client);
|
||||
};
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue