diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-24 01:54:03 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-24 01:54:03 -0400 |
| commit | 06802a819a0a2d31c952c0624cea6cd00e4e50da (patch) | |
| tree | 8ccd7c668c7fbd8f08cb89426006040217caf3f1 /net/9p | |
| parent | 9bd512f619cc116b7830134d7c9f6e404a38c7bf (diff) | |
| parent | 8f3ea33a5078a09eba12bfe57424507809367756 (diff) | |
Merge branch 'master' of ../net-2.6/
Conflicts:
net/ipv6/ndisc.c
Diffstat (limited to 'net/9p')
| -rw-r--r-- | net/9p/trans_fd.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c index 1aa9d5175398..4e8d4e724b96 100644 --- a/net/9p/trans_fd.c +++ b/net/9p/trans_fd.c | |||
| @@ -861,7 +861,6 @@ static void p9_mux_free_request(struct p9_conn *m, struct p9_req *req) | |||
| 861 | 861 | ||
| 862 | static void p9_mux_flush_cb(struct p9_req *freq, void *a) | 862 | static void p9_mux_flush_cb(struct p9_req *freq, void *a) |
| 863 | { | 863 | { |
| 864 | p9_conn_req_callback cb; | ||
| 865 | int tag; | 864 | int tag; |
| 866 | struct p9_conn *m; | 865 | struct p9_conn *m; |
| 867 | struct p9_req *req, *rreq, *rptr; | 866 | struct p9_req *req, *rreq, *rptr; |
| @@ -872,7 +871,6 @@ static void p9_mux_flush_cb(struct p9_req *freq, void *a) | |||
| 872 | freq->tcall->params.tflush.oldtag); | 871 | freq->tcall->params.tflush.oldtag); |
| 873 | 872 | ||
| 874 | spin_lock(&m->lock); | 873 | spin_lock(&m->lock); |
| 875 | cb = NULL; | ||
| 876 | tag = freq->tcall->params.tflush.oldtag; | 874 | tag = freq->tcall->params.tflush.oldtag; |
| 877 | req = NULL; | 875 | req = NULL; |
| 878 | list_for_each_entry_safe(rreq, rptr, &m->req_list, req_list) { | 876 | list_for_each_entry_safe(rreq, rptr, &m->req_list, req_list) { |