aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/nfs4proc.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 9da7a872ee0e..b4ef570eb53c 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -332,7 +332,7 @@ nfs4_free_slot(struct nfs4_slot_table *tbl, u8 free_slotid)
332 /* update highest_used_slotid when it is freed */ 332 /* update highest_used_slotid when it is freed */
333 if (slotid == tbl->highest_used_slotid) { 333 if (slotid == tbl->highest_used_slotid) {
334 slotid = find_last_bit(tbl->used_slots, tbl->max_slots); 334 slotid = find_last_bit(tbl->used_slots, tbl->max_slots);
335 if (slotid >= 0 && slotid < tbl->max_slots) 335 if (slotid < tbl->max_slots)
336 tbl->highest_used_slotid = slotid; 336 tbl->highest_used_slotid = slotid;
337 else 337 else
338 tbl->highest_used_slotid = -1; 338 tbl->highest_used_slotid = -1;
@@ -363,9 +363,8 @@ static void nfs41_sequence_free_slot(const struct nfs_client *clp,
363 dprintk("%s COMPLETE: Session Drained\n", __func__); 363 dprintk("%s COMPLETE: Session Drained\n", __func__);
364 complete(&clp->cl_session->complete); 364 complete(&clp->cl_session->complete);
365 } 365 }
366 } else { 366 } else
367 rpc_wake_up_next(&tbl->slot_tbl_waitq); 367 rpc_wake_up_next(&tbl->slot_tbl_waitq);
368 }
369 spin_unlock(&tbl->slot_tbl_lock); 368 spin_unlock(&tbl->slot_tbl_lock);
370 res->sr_slotid = NFS4_MAX_SLOT_TABLE; 369 res->sr_slotid = NFS4_MAX_SLOT_TABLE;
371} 370}
@@ -469,9 +468,9 @@ static int nfs41_setup_sequence(struct nfs4_session *session,
469 * The state manager will wait until the slot table is empty. 468 * The state manager will wait until the slot table is empty.
470 * Schedule the reset thread 469 * Schedule the reset thread
471 */ 470 */
472 dprintk("%s Schedule Session Reset\n", __func__);
473 rpc_sleep_on(&tbl->slot_tbl_waitq, task, NULL); 471 rpc_sleep_on(&tbl->slot_tbl_waitq, task, NULL);
474 spin_unlock(&tbl->slot_tbl_lock); 472 spin_unlock(&tbl->slot_tbl_lock);
473 dprintk("%s Schedule Session Reset\n", __func__);
475 return -EAGAIN; 474 return -EAGAIN;
476 } 475 }
477 476