diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2023-05-25 20:56:19 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2023-05-25 20:56:43 -0700 |
| commit | d6f1e0bfe532b2ec725d9f768ca305af7aa1029a (patch) | |
| tree | 122ed8bf3fa21f932009b4cad9e3400677d93afa /net | |
| parent | 78dbc2468de446833771a3484007ad4a3effd0fa (diff) | |
| parent | 50fb587e6a56dba74c3c56a7a09c48bff25cc5fa (diff) | |
| download | linux-d6f1e0bfe532b2ec725d9f768ca305af7aa1029a.tar.gz linux-d6f1e0bfe532b2ec725d9f768ca305af7aa1029a.tar.bz2 linux-d6f1e0bfe532b2ec725d9f768ca305af7aa1029a.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/sunrpc/sched.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c index c8321de341ee..6debf4fd42d4 100644 --- a/net/sunrpc/sched.c +++ b/net/sunrpc/sched.c @@ -927,11 +927,10 @@ static void __rpc_execute(struct rpc_task *task) */ do_action = task->tk_action; /* Tasks with an RPC error status should exit */ - if (do_action != rpc_exit_task && + if (do_action && do_action != rpc_exit_task && (status = READ_ONCE(task->tk_rpc_status)) != 0) { task->tk_status = status; - if (do_action != NULL) - do_action = rpc_exit_task; + do_action = rpc_exit_task; } /* Callbacks override all actions */ if (task->tk_callback) { |