niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

9p: client: remove unused code and any reference to "cancelled" function

Browse source 
This patch reverts commit

80b45261a0

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>
This commit is contained in:
Andi Shyti 2013-07-25 10:54:24 +02:00 • committed by David S. Miller
parent 4ce1fd6110
commit 60ff779c4a
2 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/net/9p/transport.h
View file

@ -40,8 +40,6 @@
* @close: member function to discard a connection on this transport * @close: member function to discard a connection on this transport
* @request: member function to issue a request to the transport * @request: member function to issue a request to the transport
* @cancel: member function to cancel a request (if it hasn't been sent) * @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 * 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 * 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 *); void (*close) (struct p9_client *);
int (*request) (struct p9_client *, struct p9_req_t *req); int (*request) (struct p9_client *, struct p9_req_t *req);
int (*cancel) (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 *, int (*zc_request)(struct p9_client *, struct p9_req_t *,
char *, char *, int , int, int, int); char *, char *, int , int, int, int);
}; };

9
net/9p/client.c
View file

@ -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, * if we haven't received a response for oldreq,
* remove it from the list, and notify the transport * remove it from the list
* layer that the reply will never arrive.
*/ */
spin_lock(&c->lock);
if (oldreq->status == REQ_STATUS_FLSH) { if (oldreq->status == REQ_STATUS_FLSH) {
spin_lock(&c->lock);
list_del(&oldreq->req_list); list_del(&oldreq->req_list);
spin_unlock(&c->lock); 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); p9_free_req(c, req);