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

Commit 843099ca authored by David Howells's avatar David Howells Committed by David S. Miller
Browse files

rxrpc: Don't pass gfp around in incoming call handling functions 



Don't pass gfp around in incoming call handling functions, but rather hard
code it at the points where we actually need it since the value comes from
within the rxrpc driver and is always the same.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dc44b3a0

net/rxrpc/ar-accept.c

+2 −2
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ static int rxrpc_accept_incoming_call(struct rxrpc_local *local, 
		goto error;

	}



	conn = rxrpc_incoming_connection(trans, &sp->hdr, GFP_NOIO);

	conn = rxrpc_incoming_connection(trans, &sp->hdr);

	rxrpc_put_transport(trans);

	if (IS_ERR(conn)) {

		_debug("no conn");
@@ -116,7 +116,7 @@ static int rxrpc_accept_incoming_call(struct rxrpc_local *local, 
		goto error;

	}



	call = rxrpc_incoming_call(rx, conn, &sp->hdr, GFP_NOIO);

	call = rxrpc_incoming_call(rx, conn, &sp->hdr);

	rxrpc_put_connection(conn);

	if (IS_ERR(call)) {

		_debug("no call");

net/rxrpc/ar-call.c

+3 −4
Original line number Diff line number Diff line
@@ -411,18 +411,17 @@ struct rxrpc_call *rxrpc_get_client_call(struct rxrpc_sock *rx, 
 */

struct rxrpc_call *rxrpc_incoming_call(struct rxrpc_sock *rx,

				       struct rxrpc_connection *conn,

				       struct rxrpc_host_header *hdr,

				       gfp_t gfp)

				       struct rxrpc_host_header *hdr)

{

	struct rxrpc_call *call, *candidate;

	struct rb_node **p, *parent;

	u32 call_id;



	_enter(",%d,,%x", conn->debug_id, gfp);

	_enter(",%d", conn->debug_id);



	ASSERT(rx != NULL);



	candidate = rxrpc_alloc_call(gfp);

	candidate = rxrpc_alloc_call(GFP_NOIO);

	if (!candidate)

		return ERR_PTR(-EBUSY);

net/rxrpc/ar-connection.c

+2 −3
Original line number Diff line number Diff line
@@ -619,8 +619,7 @@ int rxrpc_connect_call(struct rxrpc_sock *rx, 
 */

struct rxrpc_connection *

rxrpc_incoming_connection(struct rxrpc_transport *trans,

			  struct rxrpc_host_header *hdr,

			  gfp_t gfp)

			  struct rxrpc_host_header *hdr)

{

	struct rxrpc_connection *conn, *candidate = NULL;

	struct rb_node *p, **pp;
@@ -659,7 +658,7 @@ rxrpc_incoming_connection(struct rxrpc_transport *trans, 


	/* not yet present - create a candidate for a new record and then

	 * redo the search */

	candidate = rxrpc_alloc_connection(gfp);

	candidate = rxrpc_alloc_connection(GFP_NOIO);

	if (!candidate) {

		_leave(" = -ENOMEM");

		return ERR_PTR(-ENOMEM);

net/rxrpc/ar-internal.h

+2 −3
Original line number Diff line number Diff line
@@ -503,7 +503,7 @@ struct rxrpc_call *rxrpc_get_client_call(struct rxrpc_sock *, 
					 unsigned long, int, gfp_t);

struct rxrpc_call *rxrpc_incoming_call(struct rxrpc_sock *,

				       struct rxrpc_connection *,

				       struct rxrpc_host_header *, gfp_t);

				       struct rxrpc_host_header *);

struct rxrpc_call *rxrpc_find_server_call(struct rxrpc_sock *, unsigned long);

void rxrpc_release_call(struct rxrpc_call *);

void rxrpc_release_calls_on_socket(struct rxrpc_sock *);
@@ -528,8 +528,7 @@ void __exit rxrpc_destroy_all_connections(void); 
struct rxrpc_connection *rxrpc_find_connection(struct rxrpc_transport *,

					       struct rxrpc_host_header *);

extern struct rxrpc_connection *

rxrpc_incoming_connection(struct rxrpc_transport *, struct rxrpc_host_header *,

			  gfp_t);

rxrpc_incoming_connection(struct rxrpc_transport *, struct rxrpc_host_header *);



/*

 * ar-connevent.c