aboutsummaryrefslogtreecommitdiffstats
path: root/net/9p
diff options
context:
space:
mode:
authorAndi Shyti <andi@etezian.org>2013-07-25 10:54:24 +0200
committerDavid S. Miller <davem@davemloft.net>2013-07-30 15:54:28 -0700
commit60ff779c4abba37a31bd8624ef45026f7fb1b70c (patch)
treeeb0cec51eb8c3a9885a7014cd46333973ec5b988 /net/9p
parentbe2net: don't use dev_err when AER enabling fails (diff)
downloadlinux-dev-60ff779c4abba37a31bd8624ef45026f7fb1b70c.tar.xz
linux-dev-60ff779c4abba37a31bd8624ef45026f7fb1b70c.zip
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>
Diffstat (limited to 'net/9p')
-rw-r--r--net/9p/client.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/net/9p/client.c b/net/9p/client.c
index 8b93cae2d11d..ba93bdab2701 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);