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

NFSv4: Fix buggy nfs_wait_on_sequence()

Browse Source 
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Trond Myklebust
2005-11-25 17:09:57 -05:00
parent af95598744
commit 36f20c6df7
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
fs/nfs/nfs4state.c
View File

@@ -644,12 +644,15 @@ 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;
INIT_LIST_HEAD(&new->list); spin_lock(&sequence->lock);
list_add_tail(&new->list, &sequence->list);
spin_unlock(&sequence->lock);
} }
return new; return new;
} }
@@ -658,12 +661,10 @@ 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); spin_unlock(&sequence->lock);
spin_unlock(&sequence->lock); rpc_wake_up(&sequence->wait);
}
rpc_wake_up_next(&sequence->wait);
kfree(seqid); kfree(seqid);
} }
@@ -722,11 +723,10 @@ int nfs_wait_on_sequence(struct nfs_seqid *seqid, struct rpc_task *task)
if (sequence->list.next == &seqid->list) if (sequence->list.next == &seqid->list)
goto out; goto out;
spin_lock(&sequence->lock); spin_lock(&sequence->lock);
if (!list_empty(&sequence->list)) { if (sequence->list.next != &seqid->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: out:
return status; return status;