| Message ID | 1374742464-10686-1-git-send-email-andi@etezian.org |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
Hi David, On Thu, Jul 25, 2013 at 10:54:24AM +0200, Andi Shyti wrote: > 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. did you mean this? > - 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); I just put the spin_lock inside the if statement, so that it locks only if the statement it's true. Andi -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Andi Shyti <andi@etezian.org> Date: Thu, 25 Jul 2013 10:54:24 +0200 > 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> Applied, thanks Andi. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/net/9p/transport.h b/include/net/9p/transport.h index d9fa68f..9a36d92 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 8b93cae..ba93bda 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);
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> --- include/net/9p/transport.h | 3 --- net/9p/client.c | 9 ++------- 2 files changed, 2 insertions(+), 10 deletions(-)