From: Andi Shyti <andi@etezian.org>
To: davem@davemloft.net
Cc: dominique.martinet@cea.fr, pebolle@tiscali.nl, lucho@ionkov.net,
ericvh@gmail.com, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org,
v9fs-developer@lists.sourceforge.net, rminnich@sandia.gov,
andi@etezian.org
Subject: [PATCH] 9p: client: remove unused code and any reference to "cancelled" function
Date: Thu, 25 Jul 2013 10:54:24 +0200 [thread overview]
Message-ID: <1374742464-10686-1-git-send-email-andi@etezian.org> (raw)
In-Reply-To: <20130725061411.GA8579@nautica>
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(-)
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);
--
1.8.3.2
next prev parent reply other threads:[~2013-07-25 8:53 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-22 12:59 [PATCH] net: trans_rdma: remove unused function Andi Shyti
2013-07-24 22:46 ` David Miller
2013-07-24 23:09 ` Paul Bolle
2013-07-24 23:45 ` David Miller
2013-07-25 6:14 ` [V9fs-developer] " Dominique Martinet
2013-07-25 6:48 ` Dominique Martinet
2013-07-25 8:27 ` Andi Shyti
2013-07-25 8:35 ` David Miller
[not found] ` <CAFkjPTm1FH24EfWMDrXTh7DmU8WAb0ji-jkUgkayqMzfWj9O0A@mail.gmail.com>
2013-07-25 19:05 ` Dominique Martinet
2013-07-26 7:01 ` Dominique Martinet
[not found] ` <CAFkjPTkr5JYf6qc=pjcG8rSoocFekU-cTw450SujTvpCp33cyw@mail.gmail.com>
2013-07-26 15:17 ` Dominique Martinet
2013-07-25 8:54 ` Andi Shyti [this message]
2013-07-25 8:57 ` [PATCH] 9p: client: remove unused code and any reference to "cancelled" function Andi Shyti
2013-07-30 22:54 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1374742464-10686-1-git-send-email-andi@etezian.org \
--to=andi@etezian.org \
--cc=davem@davemloft.net \
--cc=dominique.martinet@cea.fr \
--cc=ericvh@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lucho@ionkov.net \
--cc=netdev@vger.kernel.org \
--cc=pebolle@tiscali.nl \
--cc=rminnich@sandia.gov \
--cc=v9fs-developer@lists.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).