Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60ff779c authored by Andi Shyti's avatar Andi Shyti Committed by David S. Miller
Browse files

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



This patch reverts commit

80b45261

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: default avatarAndi Shyti <andi@etezian.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4ce1fd61

include/net/9p/transport.h

+0 −3
Original line number Diff line number Diff line
@@ -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);

};

net/9p/client.c

+2 −7
Original line number Diff line number Diff line
@@ -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);