2 files changed, 7 insertions, 9 deletions

diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index d2f0550c4ba0..d78479782045 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -113,7 +113,7 @@ rpc_new_client(struct rpc_xprt *xprt, char *servname,
 
         err = -EINVAL;
         if (!xprt)
-                goto out_err;
+                goto out_no_xprt;
         if (vers >= program->nrvers || !(version = program->version[vers]))
                 goto out_err;
 
@@ -182,6 +182,7 @@ out_no_path:
         kfree(clnt);
 out_err:
         xprt_destroy(xprt);
+out_no_xprt:
         return ERR_PTR(err);
 }
 
diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
index 802d4fe0f55c..e838d042f7f5 100644
--- a/net/sunrpc/sched.c
+++ b/net/sunrpc/sched.c
@@ -515,16 +515,14 @@ struct rpc_task * rpc_wake_up_next(struct rpc_wait_queue *queue)
  */
 void rpc_wake_up(struct rpc_wait_queue *queue)
 {
-        struct rpc_task *task;
-
+        struct rpc_task *task, *next;
         struct list_head *head;
+
         spin_lock_bh(&queue->lock);
         head = &queue->tasks[queue->maxpriority];
         for (;;) {
-                while (!list_empty(head)) {
-                        task = list_entry(head->next, struct rpc_task, u.tk_wait.list);
+                list_for_each_entry_safe(task, next, head, u.tk_wait.list)
                         __rpc_wake_up_task(task);
-                }
                 if (head == &queue->tasks[0])
                         break;
                 head--;
@@ -541,14 +539,13 @@ void rpc_wake_up(struct rpc_wait_queue *queue)
  */
 void rpc_wake_up_status(struct rpc_wait_queue *queue, int status)
 {
+        struct rpc_task *task, *next;
         struct list_head *head;
-        struct rpc_task *task;
 
         spin_lock_bh(&queue->lock);
         head = &queue->tasks[queue->maxpriority];
         for (;;) {
-                while (!list_empty(head)) {
-                        task = list_entry(head->next, struct rpc_task, u.tk_wait.list);
+                list_for_each_entry_safe(task, next, head, u.tk_wait.list) {
                         task->tk_status = status;
                         __rpc_wake_up_task(task);
                 }