From owner-svn-src-user@FreeBSD.ORG  Wed Oct 14 01:25:28 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 9F539106566B;
	Wed, 14 Oct 2009 01:25:28 +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 8F21C8FC14;
	Wed, 14 Oct 2009 01:25:28 +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 n9E1PSHk022039;
	Wed, 14 Oct 2009 01:25:28 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9E1PSVu022037;
	Wed, 14 Oct 2009 01:25:28 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200910140125.n9E1PSVu022037@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Wed, 14 Oct 2009 01:25:28 +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: r198065 - 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: Wed, 14 Oct 2009 01:25:28 -0000

Author: kmacy
Date: Wed Oct 14 01:25:28 2009
New Revision: 198065
URL: http://svn.freebsd.org/changeset/base/198065

Log:
  delay teardown if user is in the middle of changing fps statet

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 23:44:32 2009	(r198064)
+++ user/kmacy/releng_8_fcs/sys/kern/uipc_socket.c	Wed Oct 14 01:25:28 2009	(r198065)
@@ -3396,6 +3396,11 @@ socketref_free(struct socketref *sr)
 	struct sockbuf *sb = &sr->sr_so->so_snd;
 	int refs;
 
+	if (sock_fp->f_count != fp->f_count) {
+		sb->sb_flags |= (SB_SENDING|SB_SENDING_TASK);
+		taskqueue_enqueue(sendfile_tq, &sr->sr_task);
+		return (1);
+	}
 	if (cred != NULL)
 		crfree(cred);
 	vrele(fp->f_vnode);