1 files changed, 13 insertions, 6 deletions

diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c
index de1e1a8b526b..50bf7c1c731c 100644
--- a/net/sunrpc/svc_xprt.c
+++ b/net/sunrpc/svc_xprt.c
@@ -932,26 +932,33 @@ static void svc_close_list(struct list_head *xprt_list)
         }
 }
 
-void svc_close_all(struct svc_serv *serv)
+static void svc_clear_pools(struct svc_serv *serv)
 {
         struct svc_pool *pool;
         struct svc_xprt *xprt;
         struct svc_xprt *tmp;
         int i;
 
-        svc_close_list(&serv->sv_tempsocks);
-        svc_close_list(&serv->sv_permsocks);
-
         for (i = 0; i < serv->sv_nrpools; i++) {
                 pool = &serv->sv_pools[i];
 
                 spin_lock_bh(&pool->sp_lock);
-                while (!list_empty(&pool->sp_sockets)) {
-                        xprt = list_first_entry(&pool->sp_sockets, struct svc_xprt, xpt_ready);
+                list_for_each_entry_safe(xprt, tmp, &pool->sp_sockets, xpt_ready) {
                         list_del_init(&xprt->xpt_ready);
                 }
                 spin_unlock_bh(&pool->sp_lock);
         }
+}
+
+void svc_close_all(struct svc_serv *serv)
+{
+        struct svc_xprt *xprt;
+        struct svc_xprt *tmp;
+
+        svc_close_list(&serv->sv_tempsocks);
+        svc_close_list(&serv->sv_permsocks);
+
+        svc_clear_pools(serv);
         /*
          * At this point the sp_sockets lists will stay empty, since
          * svc_enqueue will not add new entries without taking the