Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Andi Shyti and committed by
David S. Miller
60ff779c 4ce1fd61

+2 -10
-3
include/net/9p/transport.h
··· 40 40 * @close: member function to discard a connection on this transport 41 41 * @request: member function to issue a request to the transport 42 42 * @cancel: member function to cancel a request (if it hasn't been sent) 43 - * @cancelled: member function to notify that a cancelled request will not 44 - * not receive a reply 45 43 * 46 44 * This is the basic API for a transport module which is registered by the 47 45 * transport module with the 9P core network module and used by the client ··· 58 60 void (*close) (struct p9_client *); 59 61 int (*request) (struct p9_client *, struct p9_req_t *req); 60 62 int (*cancel) (struct p9_client *, struct p9_req_t *req); 61 - int (*cancelled)(struct p9_client *, struct p9_req_t *req); 62 63 int (*zc_request)(struct p9_client *, struct p9_req_t *, 63 64 char *, char *, int , int, int, int); 64 65 };
+2 -7
net/9p/client.c
··· 658 658 659 659 /* 660 660 * if we haven't received a response for oldreq, 661 - * remove it from the list, and notify the transport 662 - * layer that the reply will never arrive. 661 + * remove it from the list 663 662 */ 664 - spin_lock(&c->lock); 665 663 if (oldreq->status == REQ_STATUS_FLSH) { 664 + spin_lock(&c->lock); 666 665 list_del(&oldreq->req_list); 667 - spin_unlock(&c->lock); 668 - if (c->trans_mod->cancelled) 669 - c->trans_mod->cancelled(c, req); 670 - } else { 671 666 spin_unlock(&c->lock); 672 667 } 673 668