Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 9999
b: refs/heads/master
c: 7f709a4
h: refs/heads/master
i:
  9997: 8c466d0
  9995: 7c329f1
  9991: c5cbf03
  9983: e1a1c39
v: v3
  • Loading branch information
Trond Myklebust authored and Trond Myklebust committed Oct 19, 2005
1 parent 85b9ed7 commit 281c252
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: cb1f7be73b6f708d4f4ce225a3bbc02908b729e4
refs/heads/master: 7f709a48fa798cfa0f2f777c8752e12995054f78
1 change: 0 additions & 1 deletion trunk/fs/nfs/nfs4_fs.h
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ struct nfs_seqid_counter {
struct nfs_seqid {
struct list_head list;
struct nfs_seqid_counter *sequence;
struct rpc_task *task;
};

static inline void nfs_confirm_seqid(struct nfs_seqid_counter *seqid, int status)
Expand Down
9 changes: 1 addition & 8 deletions trunk/fs/nfs/nfs4state.c
Original file line number Diff line number Diff line change
Expand Up @@ -676,7 +676,6 @@ struct nfs_seqid *nfs_alloc_seqid(struct nfs_seqid_counter *counter)
new = kmalloc(sizeof(*new), GFP_KERNEL);
if (new != NULL) {
new->sequence = counter;
new->task = NULL;
spin_lock(&sequence->lock);
list_add_tail(&new->list, &sequence->list);
spin_unlock(&sequence->lock);
Expand All @@ -687,15 +686,10 @@ struct nfs_seqid *nfs_alloc_seqid(struct nfs_seqid_counter *counter)
void nfs_free_seqid(struct nfs_seqid *seqid)
{
struct rpc_sequence *sequence = seqid->sequence->sequence;
struct rpc_task *next = NULL;

spin_lock(&sequence->lock);
list_del(&seqid->list);
if (!list_empty(&sequence->list)) {
next = list_entry(sequence->list.next, struct nfs_seqid, list)->task;
if (next)
rpc_wake_up_task(next);
}
rpc_wake_up(&sequence->wait);
spin_unlock(&sequence->lock);
kfree(seqid);
}
Expand Down Expand Up @@ -754,7 +748,6 @@ int nfs_wait_on_sequence(struct nfs_seqid *seqid, struct rpc_task *task)

spin_lock(&sequence->lock);
if (sequence->list.next != &seqid->list) {
seqid->task = task;
rpc_sleep_on(&sequence->wait, task, NULL, NULL);
status = -EAGAIN;
}
Expand Down

0 comments on commit 281c252

Please sign in to comment.