From: schumaker.anna@gmail.com
To: linux-nfs@vger.kernel.org
Cc: Anna.Schumaker@Netapp.com
Subject: [RFC PATCH 6/7] sunrpc: Prepare xs_connect() for taking NULL tasks
Date: Mon, 11 Jan 2021 16:41:42 -0500 [thread overview]
Message-ID: <20210111214143.553479-7-Anna.Schumaker@Netapp.com> (raw)
In-Reply-To: <20210111214143.553479-1-Anna.Schumaker@Netapp.com>
From: Anna Schumaker <Anna.Schumaker@Netapp.com>
We won't have a task structure when we go to change IP addresses, so
check for one before calling the WARN_ON() to avoid crashing.
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
---
net/sunrpc/xprtsock.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index c56a66cdf4ac..250abf1aa018 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -2311,7 +2311,8 @@ static void xs_connect(struct rpc_xprt *xprt, struct rpc_task *task)
struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt);
unsigned long delay = 0;
- WARN_ON_ONCE(!xprt_lock_connect(xprt, task, transport));
+ if (task)
+ WARN_ON_ONCE(!xprt_lock_connect(xprt, task, transport));
if (transport->sock != NULL) {
dprintk("RPC: xs_connect delayed xprt %p for %lu "
--
2.29.2
next prev parent reply other threads:[~2021-01-11 21:43 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-11 21:41 [RFC PATCH 0/7] SUNRPC: Create sysfs files for changing IP schumaker.anna
2021-01-11 21:41 ` [RFC PATCH 1/7] net: Add a /sys/net directory to sysfs schumaker.anna
2021-01-11 21:41 ` [RFC PATCH 2/7] sunrpc: Create a sunrpc directory under /sys/net/ schumaker.anna
2021-01-11 21:41 ` [RFC PATCH 3/7] sunrpc: Create a net/ subdirectory in the sunrpc sysfs schumaker.anna
2021-01-11 21:41 ` [RFC PATCH 4/7] sunrpc: Create per-rpc_clnt sysfs kobjects schumaker.anna
2021-01-11 21:41 ` [RFC PATCH 5/7] sunrpc: Create a per-rpc_clnt file for managing the IP address schumaker.anna
2021-01-11 21:41 ` schumaker.anna [this message]
2021-01-11 21:41 ` [RFC PATCH 7/7] sunrpc: Connect to a new IP address provided by the user schumaker.anna
2021-01-12 13:09 ` [RFC PATCH 0/7] SUNRPC: Create sysfs files for changing IP Chuck Lever
2021-01-12 16:59 ` J. Bruce Fields
2021-01-13 19:23 ` Anna Schumaker
2021-01-13 19:48 ` Chuck Lever
2021-01-13 21:23 ` Chuck Lever
2021-01-14 20:29 ` Olga Kornievskaia
2021-01-19 15:55 ` Chuck Lever
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=20210111214143.553479-7-Anna.Schumaker@Netapp.com \
--to=schumaker.anna@gmail.com \
--cc=Anna.Schumaker@Netapp.com \
--cc=linux-nfs@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