From owner-cvs-src@FreeBSD.ORG  Wed Jun 28 15:34:18 2006
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: cvs-src@FreeBSD.org
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 83D1716A811;
	Wed, 28 Jun 2006 15:34:18 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 631BD4447C;
	Wed, 28 Jun 2006 14:33:47 +0000 (GMT)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5SEXlbl012169;
	Wed, 28 Jun 2006 14:33:47 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5SEXl03012168;
	Wed, 28 Jun 2006 14:33:47 GMT (envelope-from rwatson)
Message-Id: <200606281433.k5SEXl03012168@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Wed, 28 Jun 2006 14:33:47 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_6
Cc: 
Subject: cvs commit: src/sys/kern uipc_socket2.c src/sys/sys socketvar.h
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 28 Jun 2006 15:34:19 -0000

rwatson     2006-06-28 14:33:47 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    sys/kern             uipc_socket2.c 
    sys/sys              socketvar.h 
  Log:
  Merge uipc_socket2.c:1.158 and socketvar.h:1.150 from HEAD to RELENG_6:
  
    Remove sbinsertoob(), sbinsertoob_locked().  They violate (and have
    basically always violated) invariannts of soreceive(), which assume
    that the first mbuf pointer in a receive socket buffer can't change
    while the SB_LOCK sleepable lock is held on the socket buffer,
    which is precisely what these functions do.  No current protocols
    invoke these functions, and removing them will help discourage them
    from ever being used.  I should have removed them years ago, but
    lost track of it.
  
    Prodded almost by accident by:  peter
  
  Revision   Changes    Path
  1.147.2.5  +0 -64     src/sys/kern/uipc_socket2.c
  1.141.2.1  +0 -2      src/sys/sys/socketvar.h