From: David Howells <dhowells@redhat.com>
To: linux-afs@lists.infradead.org
Cc: dhowells@redhat.com, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 6/9] rxrpc: Don't pass gfp around in incoming call handling functions
Date: Thu, 07 Apr 2016 17:23:37 +0100 [thread overview]
Message-ID: <20160407162337.21283.88216.stgit@warthog.procyon.org.uk> (raw)
In-Reply-To: <20160407162256.21283.47849.stgit@warthog.procyon.org.uk>
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: David Howells <dhowells@redhat.com>
---
net/rxrpc/ar-accept.c | 4 ++--
net/rxrpc/ar-call.c | 7 +++----
net/rxrpc/ar-connection.c | 5 ++---
net/rxrpc/ar-internal.h | 5 ++---
4 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/net/rxrpc/ar-accept.c b/net/rxrpc/ar-accept.c
index 277731a5e67a..e7a7f05f13e2 100644
--- a/net/rxrpc/ar-accept.c
+++ b/net/rxrpc/ar-accept.c
@@ -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");
diff --git a/net/rxrpc/ar-call.c b/net/rxrpc/ar-call.c
index 67a211f0ebba..571a41fd5a32 100644
--- a/net/rxrpc/ar-call.c
+++ b/net/rxrpc/ar-call.c
@@ -411,18 +411,17 @@ found_extant_second:
*/
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);
diff --git a/net/rxrpc/ar-connection.c b/net/rxrpc/ar-connection.c
index 9942da1edbf6..9b6966777633 100644
--- a/net/rxrpc/ar-connection.c
+++ b/net/rxrpc/ar-connection.c
@@ -619,8 +619,7 @@ interrupted:
*/
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);
diff --git a/net/rxrpc/ar-internal.h b/net/rxrpc/ar-internal.h
index 258b74a2a23f..d38071b09f72 100644
--- a/net/rxrpc/ar-internal.h
+++ b/net/rxrpc/ar-internal.h
@@ -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
next prev parent reply other threads:[~2016-04-07 16:24 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-07 16:22 [PATCH 0/9] RxRPC: 2nd rewrite part 1 David Howells
2016-04-07 16:23 ` [PATCH 1/9] afs: Wait for outstanding async calls before closing rxrpc socket David Howells
2016-04-07 16:23 ` [PATCH 2/9] rxrpc: Disable a debugging statement that has been left enabled David Howells
2016-04-07 16:31 ` Joe Perches
2016-04-07 17:38 ` David Miller
2016-04-07 19:45 ` David Howells
2016-04-07 20:36 ` David Miller
2016-04-07 20:47 ` David Howells
2016-04-07 20:50 ` David Miller
2016-04-07 21:24 ` David Howells
2016-04-07 17:05 ` David Howells
2016-04-07 17:19 ` Joe Perches
2016-04-07 19:43 ` David Howells
2016-04-07 20:21 ` Joe Perches
2016-04-07 20:42 ` David Howells
2016-04-07 16:23 ` [PATCH 3/9] rxrpc: Move some miscellaneous bits out into their own file David Howells
2016-04-07 16:23 ` [PATCH 4/9] rxrpc: Static arrays of strings should be const char *const[] David Howells
2016-04-07 16:23 ` [PATCH 5/9] rxrpc: Differentiate local and remote abort codes in structs David Howells
2016-04-07 16:23 ` David Howells [this message]
2016-04-07 16:23 ` [PATCH 7/9] rxrpc: Don't assume transport address family and size when using it David Howells
2016-04-07 16:23 ` [PATCH 8/9] rxrpc: Absorb the rxkad security module David Howells
2016-04-07 16:23 ` [PATCH 9/9] rxrpc: Create a null security type and get rid of conditional calls David Howells
2016-04-11 19:35 ` [PATCH 0/9] RxRPC: 2nd rewrite part 1 David Miller
2016-04-11 20:38 ` David Howells
2016-04-11 22:01 ` David Howells
2016-04-12 1:26 ` David Miller
2016-04-11 22:29 ` David Howells
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160407162337.21283.88216.stgit@warthog.procyon.org.uk \
--to=dhowells@redhat.com \
--cc=linux-afs@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®