Merge tag 'nfs-rdma-for-4.16-1' of git://git.linux-nfs.org/projects/anna/linux-nfs

NFS-over-RDMA client updates for Linux 4.16

New features:
- xprtrdma tracepoints

Bugfixes and cleanups:
- Fix memory leak if rpcrdma_buffer_create() fails
- Fix allocating extra rpcrdma_reps for the backchannel
- Remove various unused and redundant variables and lock cycles
- Fix IPv6 support in xprt_rdma_set_port()
- Fix memory leak by calling buf_free for callback replies
- Fix "bytes registered" accounting
- Fix kernel-doc comments
- SUNRPC tracepoint cleanups for consistent information
- Optimizations for __rpc_execute()

1 files changed, 12 insertions, 14 deletions

diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
index b1b49edd7c4d..896691afbb1a 100644
--- a/net/sunrpc/sched.c
+++ b/net/sunrpc/sched.c
@@ -755,22 +755,20 @@ static void __rpc_execute(struct rpc_task *task)
                 void (*do_action)(struct rpc_task *);
 
                 /*
-                 * Execute any pending callback first.
+                 * Perform the next FSM step or a pending callback.
+                 *
+                 * tk_action may be NULL if the task has been killed.
+                 * In particular, note that rpc_killall_tasks may
+                 * do this at any time, so beware when dereferencing.
                  */
-                do_action = task->tk_callback;
-                task->tk_callback = NULL;
-                if (do_action == NULL) {
-                        /*
-                         * Perform the next FSM step.
-                         * tk_action may be NULL if the task has been killed.
-                         * In particular, note that rpc_killall_tasks may
-                         * do this at any time, so beware when dereferencing.
-                         */
-                        do_action = task->tk_action;
-                        if (do_action == NULL)
-                                break;
+                do_action = task->tk_action;
+                if (task->tk_callback) {
+                        do_action = task->tk_callback;
+                        task->tk_callback = NULL;
                 }
-                trace_rpc_task_run_action(task->tk_client, task, task->tk_action);
+                if (!do_action)
+                        break;
+                trace_rpc_task_run_action(task->tk_client, task, do_action);
                 do_action(task);
 
                 /*