Skip to content

L
linux-davinci
Commit bcb56164 authored by Trond Myklebust's avatar Trond Myklebust
Browse files
Options

NFSv41: More cleanups 

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 35dc1d74
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
fs/nfs/nfs4proc.c
View file @ bcb56164
...@@ -332,7 +332,7 @@ nfs4_free_slot(struct nfs4_slot_table *tbl, u8 free_slotid) ...@@ -332,7 +332,7 @@ nfs4_free_slot(struct nfs4_slot_table *tbl, u8 free_slotid)
/* update highest_used_slotid when it is freed */ /* update highest_used_slotid when it is freed */
if (slotid == tbl->highest_used_slotid) { if (slotid == tbl->highest_used_slotid) {
slotid = find_last_bit(tbl->used_slots, tbl->max_slots); slotid = find_last_bit(tbl->used_slots, tbl->max_slots);
if (slotid >= 0 && slotid < tbl->max_slots) if (slotid < tbl->max_slots)
tbl->highest_used_slotid = slotid; tbl->highest_used_slotid = slotid;
else else
tbl->highest_used_slotid = -1; tbl->highest_used_slotid = -1;
...@@ -363,9 +363,8 @@ static void nfs41_sequence_free_slot(const struct nfs_client *clp, ...@@ -363,9 +363,8 @@ static void nfs41_sequence_free_slot(const struct nfs_client *clp,
dprintk("%s COMPLETE: Session Drained\n", __func__); dprintk("%s COMPLETE: Session Drained\n", __func__);
complete(&clp->cl_session->complete); complete(&clp->cl_session->complete);
} }
} else { } else
rpc_wake_up_next(&tbl->slot_tbl_waitq); rpc_wake_up_next(&tbl->slot_tbl_waitq);
}
spin_unlock(&tbl->slot_tbl_lock); spin_unlock(&tbl->slot_tbl_lock);
res->sr_slotid = NFS4_MAX_SLOT_TABLE; res->sr_slotid = NFS4_MAX_SLOT_TABLE;
} }
...@@ -469,9 +468,9 @@ static int nfs41_setup_sequence(struct nfs4_session *session, ...@@ -469,9 +468,9 @@ static int nfs41_setup_sequence(struct nfs4_session *session,
* The state manager will wait until the slot table is empty. * The state manager will wait until the slot table is empty.
* Schedule the reset thread * Schedule the reset thread
*/ */
dprintk("%s Schedule Session Reset\n", __func__);
rpc_sleep_on(&tbl->slot_tbl_waitq, task, NULL); rpc_sleep_on(&tbl->slot_tbl_waitq, task, NULL);
spin_unlock(&tbl->slot_tbl_lock); spin_unlock(&tbl->slot_tbl_lock);
dprintk("%s Schedule Session Reset\n", __func__);
return -EAGAIN; return -EAGAIN;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment