From: Olga Kornievskaia <olga.kornievskaia@gmail.com>
To: trond.myklebust@hammerspace.com, anna.schumaker@netapp.com
Cc: linux-nfs@vger.kernel.org
Subject: [PATCH v4 04/13] sunrpc: Prepare xs_connect() for taking NULL tasks
Date: Wed, 28 Apr 2021 17:31:54 -0400 [thread overview]
Message-ID: <20210428213203.40059-5-olga.kornievskaia@gmail.com> (raw)
In-Reply-To: <20210428213203.40059-1-olga.kornievskaia@gmail.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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 47aa47a2b07c..2bcb80c19339 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -2317,7 +2317,7 @@ 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));
+ WARN_ON_ONCE(task && !xprt_lock_connect(xprt, task, transport));
if (transport->sock != NULL) {
dprintk("RPC: xs_connect delayed xprt %p for %lu "
--
2.27.0
next prev parent reply other threads:[~2021-04-28 21:32 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-28 21:31 [PATCH v4 00/13] create sysfs files for changing IP address Olga Kornievskaia
2021-04-28 21:31 ` [PATCH v4 01/13] sunrpc: Create a sunrpc directory under /sys/kernel/ Olga Kornievskaia
2021-04-28 21:31 ` [PATCH v4 02/13] sunrpc: Create a client/ subdirectory in the sunrpc sysfs Olga Kornievskaia
2021-04-28 21:31 ` [PATCH v4 03/13] sunrpc: Create per-rpc_clnt sysfs kobjects Olga Kornievskaia
2021-04-28 21:31 ` Olga Kornievskaia [this message]
2021-04-28 21:31 ` [PATCH v4 05/13] sunrpc: add xprt id Olga Kornievskaia
2021-04-28 21:31 ` [PATCH v4 06/13] sunrpc: add IDs to multipath Olga Kornievskaia
2021-04-28 21:31 ` [PATCH v4 07/13] sunrpc: keep track of the xprt_class in rpc_xprt structure Olga Kornievskaia
2021-04-28 21:31 ` [PATCH v4 08/13] sunrpc: add xprt_switch direcotry to sunrpc's sysfs Olga Kornievskaia
2021-04-28 21:31 ` [PATCH v4 09/13] sunrpc: add a symlink from rpc-client directory to the xprt_switch Olga Kornievskaia
2021-04-28 21:32 ` [PATCH v4 10/13] sunrpc: add add sysfs directory per xprt under each xprt_switch Olga Kornievskaia
2021-04-28 21:32 ` [PATCH v4 11/13] sunrpc: add dst_attr attributes to the sysfs xprt directory Olga Kornievskaia
2021-04-28 21:32 ` [PATCH v4 12/13] sunrpc: provide transport info in the sysfs directory Olga Kornievskaia
2021-04-28 21:32 ` [PATCH v4 13/13] sunrpc: provide multipath " Olga Kornievskaia
2021-04-29 14:04 ` [PATCH v4 00/13] create sysfs files for changing IP address Olga Kornievskaia
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=20210428213203.40059-5-olga.kornievskaia@gmail.com \
--to=olga.kornievskaia@gmail.com \
--cc=anna.schumaker@netapp.com \
--cc=linux-nfs@vger.kernel.org \
--cc=trond.myklebust@hammerspace.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.