From owner-svn-src-user@FreeBSD.ORG  Tue Oct 13 04:26:05 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3E9651065670;
	Tue, 13 Oct 2009 04:26:05 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2DF158FC13;
	Tue, 13 Oct 2009 04:26:05 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n9D4Q58B094648;
	Tue, 13 Oct 2009 04:26:05 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9D4Q59x094646;
	Tue, 13 Oct 2009 04:26:05 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200910130426.n9D4Q59x094646@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Tue, 13 Oct 2009 04:26:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r198016 - user/kmacy/releng_8_fcs/sys/kern
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Oct 2009 04:26:05 -0000

Author: kmacy
Date: Tue Oct 13 04:26:04 2009
New Revision: 198016
URL: http://svn.freebsd.org/changeset/base/198016

Log:
  continue to wait until the residual ref is dropped

Modified:
  user/kmacy/releng_8_fcs/sys/kern/uipc_socket.c

Modified: user/kmacy/releng_8_fcs/sys/kern/uipc_socket.c
==============================================================================
--- user/kmacy/releng_8_fcs/sys/kern/uipc_socket.c	Tue Oct 13 04:14:48 2009	(r198015)
+++ user/kmacy/releng_8_fcs/sys/kern/uipc_socket.c	Tue Oct 13 04:26:04 2009	(r198016)
@@ -624,9 +624,10 @@ sofree(struct socket *so)
 	if (bg_sendfile_enable) {
 		SOCKBUF_LOCK(&so->so_snd);
 		if ((so->so_snd.sb_flags & (SB_SENDING|SB_SENDING_TASK)) ==
-		    (SB_SENDING|SB_SENDING_TASK))
-			sbwait(&so->so_snd);
-		else if (so->so_snd.sb_flags & SB_SENDING)
+		    (SB_SENDING|SB_SENDING_TASK)) {
+			while (so->so_snd.sb_flags & SB_SENDING)
+				sbwait(&so->so_snd);
+		} else if (so->so_snd.sb_flags & SB_SENDING)
 			sosendingwakeup(&so->so_snd);
 		SOCKBUF_UNLOCK(&so->so_snd);
 	}