[PATCH v2 6/7] NFSD: Don't call nfsd4_sequence_adjust_slot_table under the client_lock

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



We may have to grow the session table.

Signed-off-by: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>
---
 fs/nfsd/nfs4state.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index a380a61..ed937c8 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -2224,10 +2224,6 @@ nfsd4_sequence(struct svc_rqst *rqstp,
 	else
 		slot->sl_flags &= ~NFSD4_SLOT_CACHETHIS;
 
-	/* Adjust slot table, and retrieve new target/highest slotid values */
-	nfsd4_sequence_adjust_slot_table(session, slot,
-			seq->highest_slotid, seq);
-
 	cstate->slot = slot;
 	cstate->session = session;
 
@@ -2251,6 +2247,11 @@ out:
 	}
 	kfree(conn);
 	spin_unlock(&client_lock);
+	/* Adjust slot table, and retrieve new target/highest slotid values */
+	if (cstate->session)
+		nfsd4_sequence_adjust_slot_table(cstate->session,
+				cstate->slot, seq->highest_slotid, seq);
+
 	dprintk("%s: return %d\n", __func__, ntohl(status));
 	return status;
 }
-- 
1.7.11.7

--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Filesystem Development]     [Linux USB Development]     [Linux Media Development]     [Video for Linux]     [Linux NILFS]     [Linux Audio Users]     [Yosemite Info]     [Linux SCSI]

  Powered by Linux