svn commit: r326607 - head/sys/fs/tmpfs

[Gleb Smirnoff]

Author: glebius
Date: Wed Dec  6 00:42:08 2017
New Revision: 326607
URL: https://svnweb.freebsd.org/changeset/base/326607

Log:
  Reduce pollution via tmpfs.h.

Modified:
  head/sys/fs/tmpfs/tmpfs.h
  head/sys/fs/tmpfs/tmpfs_subr.c
  head/sys/fs/tmpfs/tmpfs_vfsops.c
  head/sys/fs/tmpfs/tmpfs_vnops.c

Modified: head/sys/fs/tmpfs/tmpfs.h
==============================================================================
--- head/sys/fs/tmpfs/tmpfs.h	Wed Dec  6 00:29:50 2017	(r326606)
+++ head/sys/fs/tmpfs/tmpfs.h	Wed Dec  6 00:42:08 2017	(r326607)
@@ -37,22 +37,13 @@
 #ifndef _FS_TMPFS_TMPFS_H_
 #define _FS_TMPFS_TMPFS_H_
 
-#include <sys/dirent.h>
-#include <sys/mount.h>
 #include <sys/queue.h>
-#include <sys/vnode.h>
-#include <sys/file.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
-
-#include <sys/malloc.h>
-#include <sys/systm.h>
 #include <sys/tree.h>
-#include <sys/vmmeter.h>
-#include <vm/swap_pager.h>
 
+#ifdef	_SYS_MALLOC_H_
 MALLOC_DECLARE(M_TMPFSMNT);
 MALLOC_DECLARE(M_TMPFSNAME);
+#endif
 
 /*
  * Internal representation of a tmpfs directory entry.

Modified: head/sys/fs/tmpfs/tmpfs_subr.c
==============================================================================
--- head/sys/fs/tmpfs/tmpfs_subr.c	Wed Dec  6 00:29:50 2017	(r326606)
+++ head/sys/fs/tmpfs/tmpfs_subr.c	Wed Dec  6 00:42:08 2017	(r326607)
@@ -39,8 +39,11 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
+#include <sys/dirent.h>
 #include <sys/fnv_hash.h>
 #include <sys/lock.h>
+#include <sys/limits.h>
+#include <sys/mount.h>
 #include <sys/namei.h>
 #include <sys/priv.h>
 #include <sys/proc.h>
@@ -59,6 +62,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_pageout.h>
 #include <vm/vm_pager.h>
 #include <vm/vm_extern.h>
+#include <vm/swap_pager.h>
 
 #include <fs/tmpfs/tmpfs.h>
 #include <fs/tmpfs/tmpfs_fifoops.h>

Modified: head/sys/fs/tmpfs/tmpfs_vfsops.c
==============================================================================
--- head/sys/fs/tmpfs/tmpfs_vfsops.c	Wed Dec  6 00:29:50 2017	(r326606)
+++ head/sys/fs/tmpfs/tmpfs_vfsops.c	Wed Dec  6 00:42:08 2017	(r326607)
@@ -46,8 +46,10 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
+#include <sys/dirent.h>
 #include <sys/limits.h>
 #include <sys/lock.h>
+#include <sys/mount.h>
 #include <sys/mutex.h>
 #include <sys/proc.h>
 #include <sys/jail.h>
@@ -56,6 +58,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/stat.h>
 #include <sys/systm.h>
 #include <sys/sysctl.h>
+#include <sys/vnode.h>
 
 #include <vm/vm.h>
 #include <vm/vm_object.h>

Modified: head/sys/fs/tmpfs/tmpfs_vnops.c
==============================================================================
--- head/sys/fs/tmpfs/tmpfs_vnops.c	Wed Dec  6 00:29:50 2017	(r326606)
+++ head/sys/fs/tmpfs/tmpfs_vnops.c	Wed Dec  6 00:42:08 2017	(r326607)
@@ -39,9 +39,11 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
+#include <sys/dirent.h>
 #include <sys/fcntl.h>
 #include <sys/lockf.h>
 #include <sys/lock.h>
+#include <sys/mount.h>
 #include <sys/namei.h>
 #include <sys/priv.h>
 #include <sys/proc.h>