From owner-svn-src-all@FreeBSD.ORG  Tue Oct 21 10:17:52 2008
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 582DC1065670;
	Tue, 21 Oct 2008 10:17:52 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4429F8FC1F;
	Tue, 21 Oct 2008 10:17:52 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9LAHqcd095480;
	Tue, 21 Oct 2008 10:17:52 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9LAHqGK095479;
	Tue, 21 Oct 2008 10:17:52 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <200810211017.m9LAHqGK095479@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Tue, 21 Oct 2008 10:17:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r184120 - in stable/7/sys: . kern
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Oct 2008 10:17:52 -0000

Author: rwatson
Date: Tue Oct 21 10:17:51 2008
New Revision: 184120
URL: http://svn.freebsd.org/changeset/base/184120

Log:
  Merge r183803 from head to stable/7:
  
    Downgrade XXX to a Note for fgetsock() and fputsock().
  
  Approved by:	re (kib)

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/kern/kern_descrip.c

Modified: stable/7/sys/kern/kern_descrip.c
==============================================================================
--- stable/7/sys/kern/kern_descrip.c	Tue Oct 21 09:56:23 2008	(r184119)
+++ stable/7/sys/kern/kern_descrip.c	Tue Oct 21 10:17:51 2008	(r184120)
@@ -2163,7 +2163,7 @@ fgetvp_write(struct thread *td, int fd, 
  * We bump the ref count on the returned socket.  XXX Also obtain the SX lock
  * in the future.
  *
- * XXXRW: fgetsock() and fputsock() are deprecated, as consumers should rely
+ * Note: fgetsock() and fputsock() are deprecated, as consumers should rely
  * on their file descriptor reference to prevent the socket from being free'd
  * during use.
  */
@@ -2196,7 +2196,7 @@ fgetsock(struct thread *td, int fd, stru
  * Drop the reference count on the socket and XXX release the SX lock in the
  * future.  The last reference closes the socket.
  *
- * XXXRW: fputsock() is deprecated, see comment for fgetsock().
+ * Note: fputsock() is deprecated, see comment for fgetsock().
  */
 void
 fputsock(struct socket *so)