svn commit: r270888 - in stable/10: sys/dev/iscsi usr.bin/iscsictl usr.sbin/ctld usr.sbin/iscsid

Edward Tomasz Napierala trasz at FreeBSD.org
Sun Aug 31 20:21:13 UTC 2014 

Author: trasz
Date: Sun Aug 31 20:21:08 2014
New Revision: 270888
URL: http://svnweb.freebsd.org/changeset/base/270888

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

Modified:
  stable/10/sys/dev/iscsi/icl.c
  stable/10/sys/dev/iscsi/icl_proxy.c
  stable/10/sys/dev/iscsi/iscsi.c
  stable/10/usr.bin/iscsictl/iscsictl.c
  stable/10/usr.sbin/ctld/ctld.c
  stable/10/usr.sbin/ctld/discovery.c
  stable/10/usr.sbin/ctld/kernel.c
  stable/10/usr.sbin/ctld/keys.c
  stable/10/usr.sbin/ctld/log.c
  stable/10/usr.sbin/ctld/login.c
  stable/10/usr.sbin/ctld/pdu.c
  stable/10/usr.sbin/iscsid/discovery.c
  stable/10/usr.sbin/iscsid/iscsid.c
  stable/10/usr.sbin/iscsid/keys.c
  stable/10/usr.sbin/iscsid/log.c
  stable/10/usr.sbin/iscsid/login.c
  stable/10/usr.sbin/iscsid/pdu.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/iscsi/icl.c
==============================================================================
--- stable/10/sys/dev/iscsi/icl.c	Sun Aug 31 20:14:22 2014	(r270887)
+++ stable/10/sys/dev/iscsi/icl.c	Sun Aug 31 20:21:08 2014	(r270888)
@@ -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/capability.h>
 #include <sys/condvar.h>

Modified: stable/10/sys/dev/iscsi/icl_proxy.c
==============================================================================
--- stable/10/sys/dev/iscsi/icl_proxy.c	Sun Aug 31 20:14:22 2014	(r270887)
+++ stable/10/sys/dev/iscsi/icl_proxy.c	Sun Aug 31 20:21:08 2014	(r270888)
@@ -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/capability.h>
 #include <sys/condvar.h>

Modified: stable/10/sys/dev/iscsi/iscsi.c
==============================================================================
--- stable/10/sys/dev/iscsi/iscsi.c	Sun Aug 31 20:14:22 2014	(r270887)
+++ stable/10/sys/dev/iscsi/iscsi.c	Sun Aug 31 20:21:08 2014	(r270888)
@@ -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: stable/10/usr.bin/iscsictl/iscsictl.c
==============================================================================
--- stable/10/usr.bin/iscsictl/iscsictl.c	Sun Aug 31 20:14:22 2014	(r270887)
+++ stable/10/usr.bin/iscsictl/iscsictl.c	Sun Aug 31 20:21:08 2014	(r270888)
@@ -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: stable/10/usr.sbin/ctld/ctld.c
==============================================================================
--- stable/10/usr.sbin/ctld/ctld.c	Sun Aug 31 20:14:22 2014	(r270887)
+++ stable/10/usr.sbin/ctld/ctld.c	Sun Aug 31 20:21:08 2014	(r270888)
@@ -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: stable/10/usr.sbin/ctld/discovery.c
==============================================================================
--- stable/10/usr.sbin/ctld/discovery.c	Sun Aug 31 20:14:22 2014	(r270887)
+++ stable/10/usr.sbin/ctld/discovery.c	Sun Aug 31 20:21:08 2014	(r270888)
@@ -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: stable/10/usr.sbin/ctld/kernel.c
==============================================================================
--- stable/10/usr.sbin/ctld/kernel.c	Sun Aug 31 20:14:22 2014	(r270887)
+++ stable/10/usr.sbin/ctld/kernel.c	Sun Aug 31 20:21:08 2014	(r270888)
@@ -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: stable/10/usr.sbin/ctld/keys.c
==============================================================================
--- stable/10/usr.sbin/ctld/keys.c	Sun Aug 31 20:14:22 2014	(r270887)
+++ stable/10/usr.sbin/ctld/keys.c	Sun Aug 31 20:21:08 2014	(r270888)
@@ -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: stable/10/usr.sbin/ctld/log.c
==============================================================================
--- stable/10/usr.sbin/ctld/log.c	Sun Aug 31 20:14:22 2014	(r270887)
+++ stable/10/usr.sbin/ctld/log.c	Sun Aug 31 20:21:08 2014	(r270888)
@@ -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: stable/10/usr.sbin/ctld/login.c
==============================================================================
--- stable/10/usr.sbin/ctld/login.c	Sun Aug 31 20:14:22 2014	(r270887)
+++ stable/10/usr.sbin/ctld/login.c	Sun Aug 31 20:21:08 2014	(r270888)
@@ -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: stable/10/usr.sbin/ctld/pdu.c
==============================================================================
--- stable/10/usr.sbin/ctld/pdu.c	Sun Aug 31 20:14:22 2014	(r270887)
+++ stable/10/usr.sbin/ctld/pdu.c	Sun Aug 31 20:21:08 2014	(r270888)
@@ -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: stable/10/usr.sbin/iscsid/discovery.c
==============================================================================
--- stable/10/usr.sbin/iscsid/discovery.c	Sun Aug 31 20:14:22 2014	(r270887)
+++ stable/10/usr.sbin/iscsid/discovery.c	Sun Aug 31 20:21:08 2014	(r270888)
@@ -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: stable/10/usr.sbin/iscsid/iscsid.c
==============================================================================
--- stable/10/usr.sbin/iscsid/iscsid.c	Sun Aug 31 20:14:22 2014	(r270887)
+++ stable/10/usr.sbin/iscsid/iscsid.c	Sun Aug 31 20:21:08 2014	(r270888)
@@ -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: stable/10/usr.sbin/iscsid/keys.c
==============================================================================
--- stable/10/usr.sbin/iscsid/keys.c	Sun Aug 31 20:14:22 2014	(r270887)
+++ stable/10/usr.sbin/iscsid/keys.c	Sun Aug 31 20:21:08 2014	(r270888)
@@ -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: stable/10/usr.sbin/iscsid/log.c
==============================================================================
--- stable/10/usr.sbin/iscsid/log.c	Sun Aug 31 20:14:22 2014	(r270887)
+++ stable/10/usr.sbin/iscsid/log.c	Sun Aug 31 20:21:08 2014	(r270888)
@@ -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: stable/10/usr.sbin/iscsid/login.c
==============================================================================
--- stable/10/usr.sbin/iscsid/login.c	Sun Aug 31 20:14:22 2014	(r270887)
+++ stable/10/usr.sbin/iscsid/login.c	Sun Aug 31 20:21:08 2014	(r270888)
@@ -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: stable/10/usr.sbin/iscsid/pdu.c
==============================================================================
--- stable/10/usr.sbin/iscsid/pdu.c	Sun Aug 31 20:14:22 2014	(r270887)
+++ stable/10/usr.sbin/iscsid/pdu.c	Sun Aug 31 20:21:08 2014	(r270888)
@@ -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>

More information about the svn-src-stable mailing list