diff options
| author | Andi Shyti <andi@etezian.org> | 2013-07-25 10:54:24 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-07-30 15:54:28 -0700 |
| commit | 60ff779c4abba37a31bd8624ef45026f7fb1b70c (patch) | |
| tree | eb0cec51eb8c3a9885a7014cd46333973ec5b988 | |
| parent | 4ce1fd6110e1fb1747194d830a3f85952ad06172 (diff) | |
9p: client: remove unused code and any reference to "cancelled" function
This patch reverts commit
80b45261a0b263536b043c5ccfc4ba4fc27c2acc
which was implementing a 'cancelled' functionality to notify that
a cancelled request will not be replied.
This implementation was not used anywhere and therefore removed.
Signed-off-by: Andi Shyti <andi@etezian.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/net/9p/transport.h | 3 | ||||
| -rw-r--r-- | net/9p/client.c | 9 |
2 files changed, 2 insertions, 10 deletions
diff --git a/include/net/9p/transport.h b/include/net/9p/transport.h index d9fa68f26c4..9a36d929711 100644 --- a/include/net/9p/transport.h +++ b/include/net/9p/transport.h @@ -40,8 +40,6 @@ * @close: member function to discard a connection on this transport * @request: member function to issue a request to the transport * @cancel: member function to cancel a request (if it hasn't been sent) - * @cancelled: member function to notify that a cancelled request will not - * not receive a reply * * This is the basic API for a transport module which is registered by the * transport module with the 9P core network module and used by the client @@ -60,7 +58,6 @@ struct p9_trans_module { void (*close) (struct p9_client *); int (*request) (struct p9_client *, struct p9_req_t *req); int (*cancel) (struct p9_client *, struct p9_req_t *req); - int (*cancelled)(struct p9_client *, struct p9_req_t *req); int (*zc_request)(struct p9_client *, struct p9_req_t *, char *, char *, int , int, int, int); }; diff --git a/net/9p/client.c b/net/9p/client.c index 8b93cae2d11..ba93bdab270 100644 --- a/net/9p/client.c +++ b/net/9p/client.c @@ -658,17 +658,12 @@ static int p9_client_flush(struct p9_client *c, struct p9_req_t *oldreq) /* * if we haven't received a response for oldreq, - * remove it from the list, and notify the transport - * layer that the reply will never arrive. + * remove it from the list */ - spin_lock(&c->lock); if (oldreq->status == REQ_STATUS_FLSH) { + spin_lock(&c->lock); list_del(&oldreq->req_list); spin_unlock(&c->lock); - if (c->trans_mod->cancelled) - c->trans_mod->cancelled(c, req); - } else { - spin_unlock(&c->lock); } p9_free_req(c, req); |