---

yaml
---
r: 231127
b: refs/heads/master
c: f8c0d22
h: refs/heads/master
i:
  231125: ec187bb
  231123: 5add546
  231119: 70eded3
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ca7896cd83456082b1e78816cdf7e41658ef7bcd
+refs/heads/master: f8c0d226fef05226ff1a85055c8ed663022f40c1

trunk/net/sunrpc/svc_xprt.c

@@ -941,16 +941,16 @@ void svc_close_all(struct list_head *xprt_list)
 	struct svc_xprt *xprt;
 	struct svc_xprt *tmp;
 
+	/*
+	 * The server is shutting down, and no more threads are running.
+	 * svc_xprt_enqueue() might still be running, but at worst it
+	 * will re-add the xprt to sp_sockets, which will soon get
+	 * freed.  So we don't bother with any more locking, and don't
+	 * leave the close to the (nonexistent) server threads:
+	 */
 	list_for_each_entry_safe(xprt, tmp, xprt_list, xpt_list) {
 		set_bit(XPT_CLOSE, &xprt->xpt_flags);
-		if (test_bit(XPT_BUSY, &xprt->xpt_flags)) {
-			/* Waiting to be processed, but no threads left,
-			 * So just remove it from the waiting list
-			 */
-			list_del_init(&xprt->xpt_ready);
-			clear_bit(XPT_BUSY, &xprt->xpt_flags);
-		}
-		svc_close_xprt(xprt);
+		svc_delete_xprt(xprt);
 	}
 }