From 925fd94584206c2cbf423dc1c440838cdbcc569b Mon Sep 17 00:00:00 2001
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Thu, 21 Aug 2014 15:07:25 +0000
Subject: [PATCH] Use __FBSDID() properly.

Suggested by:	pluknet@
MFC after:	2 weeks
Sponsored by:	The FreeBSD Foundation
---
 sys/fs/autofs/autofs.c         | 4 +++-
 sys/fs/autofs/autofs.h         | 3 ---
 sys/fs/autofs/autofs_vfsops.c  | 4 +++-
 sys/fs/autofs/autofs_vnops.c   | 1 -
 usr.sbin/autofs/automount.c    | 4 +++-
 usr.sbin/autofs/automountd.c   | 4 +++-
 usr.sbin/autofs/autounmountd.c | 4 +++-
 usr.sbin/autofs/common.c       | 4 +++-
 usr.sbin/autofs/defined.c      | 4 +++-
 usr.sbin/autofs/log.c          | 4 +++-
 usr.sbin/autofs/popen.c        | 4 +++-
 11 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/sys/fs/autofs/autofs.c b/sys/fs/autofs/autofs.c
index 9715eea174a..f2dd775fea1 100644
--- a/sys/fs/autofs/autofs.c
+++ b/sys/fs/autofs/autofs.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
  */
 /*-
  * Copyright (c) 1989, 1991, 1993, 1995
@@ -61,6 +60,9 @@
  *
  */
 
+#include <sys/cdefs.h>
+ __FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
diff --git a/sys/fs/autofs/autofs.h b/sys/fs/autofs/autofs.h
index ec1ca664f16..35fcc8508c3 100644
--- a/sys/fs/autofs/autofs.h
+++ b/sys/fs/autofs/autofs.h
@@ -32,9 +32,6 @@
 #ifndef AUTOFS_H
 #define	AUTOFS_H
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #define VFSTOAUTOFS(mp)    ((struct autofs_mount *)((mp)->mnt_data))
 
 MALLOC_DECLARE(M_AUTOFS);
diff --git a/sys/fs/autofs/autofs_vfsops.c b/sys/fs/autofs/autofs_vfsops.c
index 0c1f36b0630..d7479e63cdb 100644
--- a/sys/fs/autofs/autofs_vfsops.c
+++ b/sys/fs/autofs/autofs_vfsops.c
@@ -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/systm.h>
 #include <sys/conf.h>
diff --git a/sys/fs/autofs/autofs_vnops.c b/sys/fs/autofs/autofs_vnops.c
index 72e8b810bc9..f1c96b4da4c 100644
--- a/sys/fs/autofs/autofs_vnops.c
+++ b/sys/fs/autofs/autofs_vnops.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
  */
 
 #include <sys/cdefs.h>
diff --git a/usr.sbin/autofs/automount.c b/usr.sbin/autofs/automount.c
index ef784a69ae6..a956b08dd5e 100644
--- a/usr.sbin/autofs/automount.c
+++ b/usr.sbin/autofs/automount.c
@@ -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>
diff --git a/usr.sbin/autofs/automountd.c b/usr.sbin/autofs/automountd.c
index 0c743a3b222..9eaf049d863 100644
--- a/usr.sbin/autofs/automountd.c
+++ b/usr.sbin/autofs/automountd.c
@@ -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>
diff --git a/usr.sbin/autofs/autounmountd.c b/usr.sbin/autofs/autounmountd.c
index 1bab9102f39..0f52b667335 100644
--- a/usr.sbin/autofs/autounmountd.c
+++ b/usr.sbin/autofs/autounmountd.c
@@ -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/event.h>
 #include <sys/mount.h>
diff --git a/usr.sbin/autofs/common.c b/usr.sbin/autofs/common.c
index 0847c3b264f..7dffd952fa1 100644
--- a/usr.sbin/autofs/common.c
+++ b/usr.sbin/autofs/common.c
@@ -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>
diff --git a/usr.sbin/autofs/defined.c b/usr.sbin/autofs/defined.c
index 7f1fb4b5d31..eaaea280d83 100644
--- a/usr.sbin/autofs/defined.c
+++ b/usr.sbin/autofs/defined.c
@@ -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 @@
  * such as ${OSNAME}, in maps.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/ioctl.h>
diff --git a/usr.sbin/autofs/log.c b/usr.sbin/autofs/log.c
index a30ebaa846c..d5682cc7263 100644
--- a/usr.sbin/autofs/log.c
+++ b/usr.sbin/autofs/log.c
@@ -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>
diff --git a/usr.sbin/autofs/popen.c b/usr.sbin/autofs/popen.c
index 420fe2064bd..6cd964daa61 100644
--- a/usr.sbin/autofs/popen.c
+++ b/usr.sbin/autofs/popen.c
@@ -34,9 +34,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/queue.h>
 #include <sys/wait.h>