[src/trunk]: src/sys/fs/nfs/client More clean-up of #includes

[pgoyette <pgoyette%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/90ec6b6762ba
branches:  trunk
changeset: 348981:90ec6b6762ba
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Fri Nov 18 22:58:08 2016 +0000

description:
More clean-up of #includes

diffstat:

 sys/fs/nfs/client/nfs_clbio.c     |  23 +++++++----------------
 sys/fs/nfs/client/nfs_clcomsubs.c |   6 +++---
 sys/fs/nfs/client/nfs_clkdtrace.c |  11 +++++++----
 sys/fs/nfs/client/nfs_clnode.c    |  11 +++++------
 sys/fs/nfs/client/nfsmount.h      |   6 +++---
 sys/fs/nfs/client/nfsnode.h       |   7 ++-----
 6 files changed, 27 insertions(+), 37 deletions(-)

diffs (212 lines):

diff -r f609184d96ff -r 90ec6b6762ba sys/fs/nfs/client/nfs_clbio.c
--- a/sys/fs/nfs/client/nfs_clbio.c     Fri Nov 18 22:50:19 2016 +0000
+++ b/sys/fs/nfs/client/nfs_clbio.c     Fri Nov 18 22:58:08 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nfs_clbio.c,v 1.3 2016/11/18 08:31:30 pgoyette Exp $   */
+/*     $NetBSD: nfs_clbio.c,v 1.4 2016/11/18 22:58:08 pgoyette Exp $   */
 /*-
  * Copyright (c) 1989, 1993
  *     The Regents of the University of California.  All rights reserved.
@@ -35,11 +35,10 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("FreeBSD: head/sys/fs/nfsclient/nfs_clbio.c 304026 2016-08-12 22:44:59Z rmacklem "); */
-__RCSID("$NetBSD: nfs_clbio.c,v 1.3 2016/11/18 08:31:30 pgoyette Exp $");
+__RCSID("$NetBSD: nfs_clbio.c,v 1.4 2016/11/18 22:58:08 pgoyette Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/bio.h>
 #include <sys/buf.h>
 #include <sys/kernel.h>
 #include <sys/mount.h>
@@ -47,19 +46,11 @@
 #include <sys/vmmeter.h>
 #include <sys/vnode.h>
 
-#include <vm/vm.h>
-#include <vm/vm_param.h>
-#include <vm/vm_extern.h>
-#include <vm/vm_page.h>
-#include <vm/vm_object.h>
-#include <vm/vm_pager.h>
-#include <vm/vnode_pager.h>
-
-#include <fs/nfs/nfsport.h>
-#include <fs/nfsclient/nfsmount.h>
-#include <fs/nfsclient/nfs.h>
-#include <fs/nfsclient/nfsnode.h>
-#include <fs/nfsclient/nfs_kdtrace.h>
+#include <fs/nfs/common/nfsport.h>
+#include <fs/nfs/client/nfsmount.h>
+#include <fs/nfs/client/nfs.h>
+#include <fs/nfs/client/nfsnode.h>
+#include <fs/nfs/client/nfs_kdtrace.h>
 
 extern int newnfs_directio_allow_mmap;
 extern struct nfsstatsv1 nfsstatsv1;
diff -r f609184d96ff -r 90ec6b6762ba sys/fs/nfs/client/nfs_clcomsubs.c
--- a/sys/fs/nfs/client/nfs_clcomsubs.c Fri Nov 18 22:50:19 2016 +0000
+++ b/sys/fs/nfs/client/nfs_clcomsubs.c Fri Nov 18 22:58:08 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nfs_clcomsubs.c,v 1.1.1.2 2016/11/18 07:49:10 pgoyette Exp $   */
+/*     $NetBSD: nfs_clcomsubs.c,v 1.2 2016/11/18 22:58:08 pgoyette Exp $       */
 /*-
  * Copyright (c) 1989, 1993
  *     The Regents of the University of California.  All rights reserved.
@@ -34,7 +34,7 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("FreeBSD: head/sys/fs/nfsclient/nfs_clcomsubs.c 304026 2016-08-12 22:44:59Z rmacklem "); */
-__RCSID("$NetBSD: nfs_clcomsubs.c,v 1.1.1.2 2016/11/18 07:49:10 pgoyette Exp $");
+__RCSID("$NetBSD: nfs_clcomsubs.c,v 1.2 2016/11/18 22:58:08 pgoyette Exp $");
 
 /*
  * These functions support the macros and help fiddle mbuf chains for
@@ -42,7 +42,7 @@
  * copy data between mbuf chains and uio lists.
  */
 #ifndef APPLEKEXT
-#include <fs/nfs/nfsport.h>
+#include <fs/nfs/common/nfsport.h>
 
 extern struct nfsstatsv1 nfsstatsv1;
 extern struct nfsv4_opflag nfsv4_opflag[NFSV41_NOPS];
diff -r f609184d96ff -r 90ec6b6762ba sys/fs/nfs/client/nfs_clkdtrace.c
--- a/sys/fs/nfs/client/nfs_clkdtrace.c Fri Nov 18 22:50:19 2016 +0000
+++ b/sys/fs/nfs/client/nfs_clkdtrace.c Fri Nov 18 22:58:08 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nfs_clkdtrace.c,v 1.1.1.1 2016/11/18 07:49:10 pgoyette Exp $   */
+/*     $NetBSD: nfs_clkdtrace.c,v 1.2 2016/11/18 22:58:08 pgoyette Exp $       */
 /*-
  * Copyright (c) 2009 Robert N. M. Watson
  * All rights reserved.
@@ -30,7 +30,7 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("FreeBSD: head/sys/fs/nfsclient/nfs_clkdtrace.c 298788 2016-04-29 16:07:25Z pfg "); */
-__RCSID("$NetBSD: nfs_clkdtrace.c,v 1.1.1.1 2016/11/18 07:49:10 pgoyette Exp $");
+__RCSID("$NetBSD: nfs_clkdtrace.c,v 1.2 2016/11/18 22:58:08 pgoyette Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -39,12 +39,15 @@
 #include <sys/malloc.h>
 #include <sys/module.h>
 
+#if 0
 #include <sys/dtrace.h>
+#endif
+
 #include <sys/dtrace_bsd.h>
 
-#include <fs/nfs/nfsproto.h>
+#include <fs/nfs/common/nfsproto.h>
 
-#include <fs/nfsclient/nfs_kdtrace.h>
+#include <fs/nfs/client/nfs_kdtrace.h>
 
 /*
  * dtnfscl is a DTrace provider that tracks the intent to perform RPCs
diff -r f609184d96ff -r 90ec6b6762ba sys/fs/nfs/client/nfs_clnode.c
--- a/sys/fs/nfs/client/nfs_clnode.c    Fri Nov 18 22:50:19 2016 +0000
+++ b/sys/fs/nfs/client/nfs_clnode.c    Fri Nov 18 22:58:08 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nfs_clnode.c,v 1.1.1.2 2016/11/18 07:49:11 pgoyette Exp $      */
+/*     $NetBSD: nfs_clnode.c,v 1.2 2016/11/18 22:58:08 pgoyette Exp $  */
 /*-
  * Copyright (c) 1989, 1993
  *     The Regents of the University of California.  All rights reserved.
@@ -35,7 +35,7 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("FreeBSD: head/sys/fs/nfsclient/nfs_clnode.c 302210 2016-06-26 14:18:28Z kib "); */
-__RCSID("$NetBSD: nfs_clnode.c,v 1.1.1.2 2016/11/18 07:49:11 pgoyette Exp $");
+__RCSID("$NetBSD: nfs_clnode.c,v 1.2 2016/11/18 22:58:08 pgoyette Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -68,7 +68,7 @@
 
 const char nfs_vnode_tag[] = "nfs";
 
-static void    nfs_freesillyrename(void *arg, __unused int pending);
+static void    nfs_freesillyrename(void *arg);
 
 void
 ncl_nhinit(void)
@@ -191,7 +191,7 @@
  * deadlock because of a LOR when vrele() locks the directory vnode.
  */
 static void
-nfs_freesillyrename(void *arg, __unused int pending)
+nfs_freesillyrename(void *arg)
 {
        struct sillyrename *sp;
 
@@ -222,8 +222,7 @@
                 */
                ncl_removeit(sp, vp);
                crfree(sp->s_cred);
-               TASK_INIT(&sp->s_task, 0, nfs_freesillyrename, sp);
-               taskqueue_enqueue(taskqueue_thread, &sp->s_task);
+               sysmon_task_queue_sched(0, nfs_freesillyrename, sp);
                mtx_lock(&np->n_mtx);
        }
 }
diff -r f609184d96ff -r 90ec6b6762ba sys/fs/nfs/client/nfsmount.h
--- a/sys/fs/nfs/client/nfsmount.h      Fri Nov 18 22:50:19 2016 +0000
+++ b/sys/fs/nfs/client/nfsmount.h      Fri Nov 18 22:58:08 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nfsmount.h,v 1.1.1.1 2013/09/30 07:19:30 dholland Exp $        */
+/*     $NetBSD: nfsmount.h,v 1.2 2016/11/18 22:58:08 pgoyette Exp $    */
 /*-
  * Copyright (c) 1989, 1993
  *     The Regents of the University of California.  All rights reserved.
@@ -31,13 +31,13 @@
  * SUCH DAMAGE.
  *
  * FreeBSD: head/sys/fs/nfsclient/nfsmount.h 244042 2012-12-08 22:52:39Z rmacklem 
- * $NetBSD: nfsmount.h,v 1.1.1.1 2013/09/30 07:19:30 dholland Exp $
+ * $NetBSD: nfsmount.h,v 1.2 2016/11/18 22:58:08 pgoyette Exp $
  */
 
 #ifndef _NFSCLIENT_NFSMOUNT_H_
 #define        _NFSCLIENT_NFSMOUNT_H_
 
-#include <nfs/nfs_mountcommon.h>
+#include <fs/nfs//common/nfs_mountcommon.h>
 
 /*
  * Mount structure.
diff -r f609184d96ff -r 90ec6b6762ba sys/fs/nfs/client/nfsnode.h
--- a/sys/fs/nfs/client/nfsnode.h       Fri Nov 18 22:50:19 2016 +0000
+++ b/sys/fs/nfs/client/nfsnode.h       Fri Nov 18 22:58:08 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nfsnode.h,v 1.1.1.2 2016/11/18 07:49:11 pgoyette Exp $ */
+/*     $NetBSD: nfsnode.h,v 1.2 2016/11/18 22:58:08 pgoyette Exp $     */
 /*-
  * Copyright (c) 1989, 1993
  *     The Regents of the University of California.  All rights reserved.
@@ -31,20 +31,17 @@
  * SUCH DAMAGE.
  *
  * FreeBSD: head/sys/fs/nfsclient/nfsnode.h 303715 2016-08-03 15:58:20Z kib 
- * $NetBSD: nfsnode.h,v 1.1.1.2 2016/11/18 07:49:11 pgoyette Exp $
+ * $NetBSD: nfsnode.h,v 1.2 2016/11/18 22:58:08 pgoyette Exp $
  */
 
 #ifndef _NFSCLIENT_NFSNODE_H_
 #define        _NFSCLIENT_NFSNODE_H_
 
-#include <sys/_task.h>
-
 /*
  * Silly rename structure that hangs off the nfsnode until the name
  * can be removed by nfs_inactive()
  */
 struct sillyrename {
-       struct  task s_task;
        struct  ucred *s_cred;
        struct  vnode *s_dvp;
        long    s_namlen;