lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

NFSv4: Final tweak to sequence id

Browse Source 
Sacrifice queueing fairness for performance.

 Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Trond Myklebust
2005-10-20 14:22:41 -07:00
parent a0857d03b2
commit 4e51336a00
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fs/nfs/nfs4_fs.h
View File

@@ -110,8 +110,8 @@ struct nfs_seqid_counter {
}; };
struct nfs_seqid { struct nfs_seqid {
struct list_head list;
struct nfs_seqid_counter *sequence; struct nfs_seqid_counter *sequence;
struct list_head list;
}; };
static inline void nfs_confirm_seqid(struct nfs_seqid_counter *seqid, int status) static inline void nfs_confirm_seqid(struct nfs_seqid_counter *seqid, int status)

17
fs/nfs/nfs4state.c
View File

@@ -670,15 +670,12 @@ void nfs4_copy_stateid(nfs4_stateid *dst, struct nfs4_state *state, fl_owner_t f
struct nfs_seqid *nfs_alloc_seqid(struct nfs_seqid_counter *counter) struct nfs_seqid *nfs_alloc_seqid(struct nfs_seqid_counter *counter)
{ {
struct rpc_sequence *sequence = counter->sequence;
struct nfs_seqid *new; struct nfs_seqid *new;
new = kmalloc(sizeof(*new), GFP_KERNEL); new = kmalloc(sizeof(*new), GFP_KERNEL);
if (new != NULL) { if (new != NULL) {
new->sequence = counter; new->sequence = counter;
spin_lock(&sequence->lock); INIT_LIST_HEAD(&new->list);
list_add_tail(&new->list, &sequence->list);
spin_unlock(&sequence->lock);
} }
return new; return new;
} }
@@ -687,10 +684,12 @@ void nfs_free_seqid(struct nfs_seqid *seqid)
{ {
struct rpc_sequence *sequence = seqid->sequence->sequence; struct rpc_sequence *sequence = seqid->sequence->sequence;
if (!list_empty(&seqid->list)) {
spin_lock(&sequence->lock); spin_lock(&sequence->lock);
list_del(&seqid->list); list_del(&seqid->list);
rpc_wake_up(&sequence->wait);
spin_unlock(&sequence->lock); spin_unlock(&sequence->lock);
}
rpc_wake_up_next(&sequence->wait);
kfree(seqid); kfree(seqid);
} }
@@ -746,12 +745,16 @@ int nfs_wait_on_sequence(struct nfs_seqid *seqid, struct rpc_task *task)
struct rpc_sequence *sequence = seqid->sequence->sequence; struct rpc_sequence *sequence = seqid->sequence->sequence;
int status = 0; int status = 0;
if (sequence->list.next == &seqid->list)
goto out;
spin_lock(&sequence->lock); spin_lock(&sequence->lock);
if (sequence->list.next != &seqid->list) { if (!list_empty(&sequence->list)) {
rpc_sleep_on(&sequence->wait, task, NULL, NULL); rpc_sleep_on(&sequence->wait, task, NULL, NULL);
status = -EAGAIN; status = -EAGAIN;
} } else
list_add(&seqid->list, &sequence->list);
spin_unlock(&sequence->lock); spin_unlock(&sequence->lock);
out:
return status; return status;
} }