From owner-svn-src-head@FreeBSD.ORG  Thu Aug 21 15:32:42 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A10EBBE0;
 Thu, 21 Aug 2014 15:32:42 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8A6C533F4;
 Thu, 21 Aug 2014 15:32:42 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7LFWgZr031340;
 Thu, 21 Aug 2014 15:32:42 GMT (envelope-from trasz@FreeBSD.org)
Received: (from trasz@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7LFWcj6031317;
 Thu, 21 Aug 2014 15:32:38 GMT (envelope-from trasz@FreeBSD.org)
Message-Id: <201408211532.s7LFWcj6031317@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: trasz set sender to
 trasz@FreeBSD.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Thu, 21 Aug 2014 15:32:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270279 - in head: sys/dev/iscsi usr.bin/iscsictl
 usr.sbin/ctld usr.sbin/iscsid
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 Aug 2014 15:32:42 -0000

Author: trasz
Date: Thu Aug 21 15:32:38 2014
New Revision: 270279
URL: http://svnweb.freebsd.org/changeset/base/270279

Log:
  Make the iSCSI stack use __FBSDID() properly.
  
  MFC after:	2 weeks
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/sys/dev/iscsi/icl.c
  head/sys/dev/iscsi/icl_proxy.c
  head/sys/dev/iscsi/iscsi.c
  head/usr.bin/iscsictl/iscsictl.c
  head/usr.sbin/ctld/ctld.c
  head/usr.sbin/ctld/discovery.c
  head/usr.sbin/ctld/kernel.c
  head/usr.sbin/ctld/keys.c
  head/usr.sbin/ctld/log.c
  head/usr.sbin/ctld/login.c
  head/usr.sbin/ctld/pdu.c
  head/usr.sbin/iscsid/discovery.c
  head/usr.sbin/iscsid/iscsid.c
  head/usr.sbin/iscsid/keys.c
  head/usr.sbin/iscsid/log.c
  head/usr.sbin/iscsid/login.c
  head/usr.sbin/iscsid/pdu.c

Modified: head/sys/dev/iscsi/icl.c
==============================================================================
--- head/sys/dev/iscsi/icl.c	Thu Aug 21 15:14:54 2014	(r270278)
+++ head/sys/dev/iscsi/icl.c	Thu Aug 21 15:32:38 2014	(r270279)
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
  */
 
 /*
@@ -34,6 +33,9 @@
  * and receive iSCSI PDUs.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/capsicum.h>
 #include <sys/condvar.h>

Modified: head/sys/dev/iscsi/icl_proxy.c
==============================================================================
--- head/sys/dev/iscsi/icl_proxy.c	Thu Aug 21 15:14:54 2014	(r270278)
+++ head/sys/dev/iscsi/icl_proxy.c	Thu Aug 21 15:32:38 2014	(r270279)
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
  */
 /*-
  * Copyright (c) 1982, 1986, 1989, 1990, 1993
@@ -68,6 +67,9 @@
 
 #ifdef ICL_KERNEL_PROXY
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/capsicum.h>
 #include <sys/condvar.h>

Modified: head/sys/dev/iscsi/iscsi.c
==============================================================================
--- head/sys/dev/iscsi/iscsi.c	Thu Aug 21 15:14:54 2014	(r270278)
+++ head/sys/dev/iscsi/iscsi.c	Thu Aug 21 15:32:38 2014	(r270279)
@@ -26,9 +26,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/condvar.h>
 #include <sys/conf.h>

Modified: head/usr.bin/iscsictl/iscsictl.c
==============================================================================
--- head/usr.bin/iscsictl/iscsictl.c	Thu Aug 21 15:14:54 2014	(r270278)
+++ head/usr.bin/iscsictl/iscsictl.c	Thu Aug 21 15:32:38 2014	(r270279)
@@ -26,9 +26,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/ioctl.h>
 #include <sys/param.h>
 #include <sys/linker.h>

Modified: head/usr.sbin/ctld/ctld.c
==============================================================================
--- head/usr.sbin/ctld/ctld.c	Thu Aug 21 15:14:54 2014	(r270278)
+++ head/usr.sbin/ctld/ctld.c	Thu Aug 21 15:32:38 2014	(r270279)
@@ -26,9 +26,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/socket.h>

Modified: head/usr.sbin/ctld/discovery.c
==============================================================================
--- head/usr.sbin/ctld/discovery.c	Thu Aug 21 15:14:54 2014	(r270278)
+++ head/usr.sbin/ctld/discovery.c	Thu Aug 21 15:32:38 2014	(r270279)
@@ -26,9 +26,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <assert.h>
 #include <stdint.h>
 #include <stdio.h>

Modified: head/usr.sbin/ctld/kernel.c
==============================================================================
--- head/usr.sbin/ctld/kernel.c	Thu Aug 21 15:14:54 2014	(r270278)
+++ head/usr.sbin/ctld/kernel.c	Thu Aug 21 15:32:38 2014	(r270279)
@@ -32,9 +32,11 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/stat.h>

Modified: head/usr.sbin/ctld/keys.c
==============================================================================
--- head/usr.sbin/ctld/keys.c	Thu Aug 21 15:14:54 2014	(r270278)
+++ head/usr.sbin/ctld/keys.c	Thu Aug 21 15:32:38 2014	(r270279)
@@ -26,9 +26,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <assert.h>
 #include <stdint.h>
 #include <stdio.h>

Modified: head/usr.sbin/ctld/log.c
==============================================================================
--- head/usr.sbin/ctld/log.c	Thu Aug 21 15:14:54 2014	(r270278)
+++ head/usr.sbin/ctld/log.c	Thu Aug 21 15:32:38 2014	(r270279)
@@ -26,9 +26,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>

Modified: head/usr.sbin/ctld/login.c
==============================================================================
--- head/usr.sbin/ctld/login.c	Thu Aug 21 15:14:54 2014	(r270278)
+++ head/usr.sbin/ctld/login.c	Thu Aug 21 15:32:38 2014	(r270279)
@@ -26,9 +26,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <assert.h>
 #include <stdbool.h>
 #include <stdint.h>

Modified: head/usr.sbin/ctld/pdu.c
==============================================================================
--- head/usr.sbin/ctld/pdu.c	Thu Aug 21 15:14:54 2014	(r270278)
+++ head/usr.sbin/ctld/pdu.c	Thu Aug 21 15:32:38 2014	(r270279)
@@ -26,9 +26,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include <sys/uio.h>
 #include <assert.h>

Modified: head/usr.sbin/iscsid/discovery.c
==============================================================================
--- head/usr.sbin/iscsid/discovery.c	Thu Aug 21 15:14:54 2014	(r270278)
+++ head/usr.sbin/iscsid/discovery.c	Thu Aug 21 15:32:38 2014	(r270279)
@@ -26,9 +26,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <assert.h>

Modified: head/usr.sbin/iscsid/iscsid.c
==============================================================================
--- head/usr.sbin/iscsid/iscsid.c	Thu Aug 21 15:14:54 2014	(r270278)
+++ head/usr.sbin/iscsid/iscsid.c	Thu Aug 21 15:32:38 2014	(r270279)
@@ -26,9 +26,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/ioctl.h>

Modified: head/usr.sbin/iscsid/keys.c
==============================================================================
--- head/usr.sbin/iscsid/keys.c	Thu Aug 21 15:14:54 2014	(r270278)
+++ head/usr.sbin/iscsid/keys.c	Thu Aug 21 15:32:38 2014	(r270279)
@@ -26,9 +26,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <assert.h>
 #include <stdint.h>
 #include <stdio.h>

Modified: head/usr.sbin/iscsid/log.c
==============================================================================
--- head/usr.sbin/iscsid/log.c	Thu Aug 21 15:14:54 2014	(r270278)
+++ head/usr.sbin/iscsid/log.c	Thu Aug 21 15:32:38 2014	(r270279)
@@ -26,9 +26,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>

Modified: head/usr.sbin/iscsid/login.c
==============================================================================
--- head/usr.sbin/iscsid/login.c	Thu Aug 21 15:14:54 2014	(r270278)
+++ head/usr.sbin/iscsid/login.c	Thu Aug 21 15:32:38 2014	(r270279)
@@ -26,9 +26,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <assert.h>

Modified: head/usr.sbin/iscsid/pdu.c
==============================================================================
--- head/usr.sbin/iscsid/pdu.c	Thu Aug 21 15:14:54 2014	(r270278)
+++ head/usr.sbin/iscsid/pdu.c	Thu Aug 21 15:32:38 2014	(r270279)
@@ -26,9 +26,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include <sys/uio.h>
 #include <assert.h>