浏览代码

NFSv4: Ensure we throw out bad delegation stateids on NFS4ERR_BAD_STATEID

To ensure that we don't just reuse the bad delegation when we attempt to
recover the nfs4_state that received the bad stateid error.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Cc: stable@vger.kernel.org
Trond Myklebust 13 年之前
父节点
当前提交
b9f9a03150
共有 1 个文件被更改,包括 2 次插入0 次删除
  1. 2 0
      fs/nfs/nfs4state.c

+ 2 - 0
fs/nfs/nfs4state.c

@@ -1132,6 +1132,8 @@ void nfs4_schedule_stateid_recovery(const struct nfs_server *server, struct nfs4
 {
 {
 	struct nfs_client *clp = server->nfs_client;
 	struct nfs_client *clp = server->nfs_client;
 
 
+	if (test_and_clear_bit(NFS_DELEGATED_STATE, &state->flags))
+		nfs_async_inode_return_delegation(state->inode, &state->stateid);
 	nfs4_state_mark_reclaim_nograce(clp, state);
 	nfs4_state_mark_reclaim_nograce(clp, state);
 	nfs4_schedule_state_manager(clp);
 	nfs4_schedule_state_manager(clp);
 }
 }