nfsd: Move private headers to source directory

Lots of include/linux/nfsd/* headers are only used by nfsd module. Move them to the source directory Signed-off-by: Boaz Harrosh <bharrosh@panasas.com> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
2009-12-03 20:30:56 +02:00 · 2009-12-03 20:30:56 +02:00 · 9a74af2133
--- a/fs/nfsd/auth.c
+++ b/fs/nfsd/auth.c
@ -5,7 +5,7 @@
 */

 #include <linux/sched.h>
-#include <linux/nfsd/nfsd.h>
+#include "nfsd.h"
 #include "auth.h"

 int nfsexp_flags(struct svc_rqst *rqstp, struct svc_export *exp)
--- a/include/linux/nfsd/cache.h
+++ b/include/linux/nfsd/cache.h
--- a/fs/nfsd/export.c
+++ b/fs/nfsd/export.c
@ -18,10 +18,11 @@
 #include <linux/module.h>
 #include <linux/exportfs.h>

-#include <linux/nfsd/nfsd.h>
 #include <linux/nfsd/syscall.h>
 #include <net/ipv6.h>

+#include "nfsd.h"
+
 #define NFSDDBG_FACILITY	NFSDDBG_EXPORT

 typedef struct auth_domain	svc_client;
--- a/fs/nfsd/lockd.c
+++ b/fs/nfsd/lockd.c
@ -9,8 +9,8 @@
 */

 #include <linux/file.h>
-#include <linux/nfsd/nfsd.h>
 #include <linux/lockd/bind.h>
+#include "nfsd.h"
 #include "vfs.h"

 #define NFSDDBG_FACILITY		NFSDDBG_LOCKD
--- a/fs/nfsd/nfs2acl.c
+++ b/fs/nfsd/nfs2acl.c
@ -6,10 +6,11 @@
 * Copyright (C) 2002-2003 Andreas Gruenbacher <agruen@suse.de>
 */

-#include <linux/nfsd/nfsd.h>
-#include <linux/nfsd/cache.h>
-#include <linux/nfsd/xdr3.h>
+#include "nfsd.h"
+/* FIXME: nfsacl.h is a broken header */
 #include <linux/nfsacl.h>
+#include "cache.h"
+#include "xdr3.h"
 #include "vfs.h"

 #define NFSDDBG_FACILITY		NFSDDBG_PROC
--- a/fs/nfsd/nfs3acl.c
+++ b/fs/nfsd/nfs3acl.c
@ -6,10 +6,11 @@
 * Copyright (C) 2002-2003 Andreas Gruenbacher <agruen@suse.de>
 */

-#include <linux/nfsd/nfsd.h>
-#include <linux/nfsd/cache.h>
-#include <linux/nfsd/xdr3.h>
+#include "nfsd.h"
+/* FIXME: nfsacl.h is a broken header */
 #include <linux/nfsacl.h>
+#include "cache.h"
+#include "xdr3.h"
 #include "vfs.h"

 #define RETURN_STATUS(st)	{ resp->status = (st); return (st); }
--- a/fs/nfsd/nfs3proc.c
+++ b/fs/nfsd/nfs3proc.c
@ -10,8 +10,8 @@
 #include <linux/ext2_fs.h>
 #include <linux/magic.h>

-#include <linux/nfsd/cache.h>
-#include <linux/nfsd/xdr3.h>
+#include "cache.h"
+#include "xdr3.h"
 #include "vfs.h"

 #define NFSDDBG_FACILITY		NFSDDBG_PROC
--- a/fs/nfsd/nfs3xdr.c
+++ b/fs/nfsd/nfs3xdr.c
@ -9,7 +9,7 @@
 */

 #include <linux/namei.h>
-#include <linux/nfsd/xdr3.h>
+#include "xdr3.h"
 #include "auth.h"

 #define NFSDDBG_FACILITY		NFSDDBG_XDR
--- a/fs/nfsd/nfs4callback.c
+++ b/fs/nfsd/nfs4callback.c
@ -34,8 +34,8 @@
 */

 #include <linux/sunrpc/clnt.h>
-#include <linux/nfsd/nfsd.h>
-#include <linux/nfsd/state.h>
+#include "nfsd.h"
+#include "state.h"

 #define NFSDDBG_FACILITY                NFSDDBG_PROC

--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@ -36,8 +36,8 @@
 */
 #include <linux/file.h>

-#include <linux/nfsd/cache.h>
-#include <linux/nfsd/xdr4.h>
+#include "cache.h"
+#include "xdr4.h"
 #include "vfs.h"

 #define NFSDDBG_FACILITY		NFSDDBG_PROC
--- a/fs/nfsd/nfs4recover.c
+++ b/fs/nfsd/nfs4recover.c
@ -33,12 +33,13 @@
 *
 */

-#include <linux/nfsd/nfsd.h>
-#include <linux/nfsd/state.h>
 #include <linux/file.h>
 #include <linux/namei.h>
 #include <linux/crypto.h>
 #include <linux/sched.h>
+
+#include "nfsd.h"
+#include "state.h"
 #include "vfs.h"

 #define NFSDDBG_FACILITY                NFSDDBG_PROC
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@ -36,11 +36,11 @@

 #include <linux/file.h>
 #include <linux/smp_lock.h>
-#include <linux/nfsd/xdr4.h>
 #include <linux/namei.h>
 #include <linux/swap.h>
 #include <linux/sunrpc/svcauth_gss.h>
 #include <linux/sunrpc/clnt.h>
+#include "xdr4.h"
 #include "vfs.h"

 #define NFSDDBG_FACILITY                NFSDDBG_PROC
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@ -43,10 +43,11 @@
 #include <linux/namei.h>
 #include <linux/statfs.h>
 #include <linux/utsname.h>
-#include <linux/nfsd/xdr4.h>
 #include <linux/nfsd_idmap.h>
 #include <linux/nfs4_acl.h>
 #include <linux/sunrpc/svcauth_gss.h>
+
+#include "xdr4.h"
 #include "vfs.h"

 #define NFSDDBG_FACILITY		NFSDDBG_XDR
--- a/fs/nfsd/nfscache.c
+++ b/fs/nfsd/nfscache.c
@ -10,8 +10,8 @@
 * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de>
 */

-#include <linux/nfsd/nfsd.h>
-#include <linux/nfsd/cache.h>
+#include "nfsd.h"
+#include "cache.h"

 /* Size of reply cache. Common values are:
 * 4.3BSD:	128
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@ -11,12 +11,13 @@

 #include <linux/nfsd_idmap.h>
 #include <linux/sunrpc/svcsock.h>
-#include <linux/nfsd/nfsd.h>
-#include <linux/nfsd/cache.h>
 #include <linux/nfsd/syscall.h>
 #include <linux/lockd/lockd.h>
 #include <linux/sunrpc/clnt.h>

+#include "nfsd.h"
+#include "cache.h"
+
 /*
 *	We have a single directory with 9 nodes in it.
 */
--- a/include/linux/nfsd/nfsd.h
+++ b/include/linux/nfsd/nfsd.h
--- a/fs/nfsd/nfsfh.c
+++ b/fs/nfsd/nfsfh.c
@ -12,7 +12,7 @@
 #include <linux/exportfs.h>

 #include <linux/sunrpc/svcauth_gss.h>
-#include <linux/nfsd/nfsd.h>
+#include "nfsd.h"
 #include "vfs.h"
 #include "auth.h"

--- a/fs/nfsd/nfsproc.c
+++ b/fs/nfsd/nfsproc.c
@ -9,8 +9,8 @@

 #include <linux/namei.h>

-#include <linux/nfsd/cache.h>
-#include <linux/nfsd/xdr.h>
+#include "cache.h"
+#include "xdr.h"
 #include "vfs.h"

 typedef struct svc_rqst	svc_rqst;
--- a/fs/nfsd/nfssvc.c
+++ b/fs/nfsd/nfssvc.c
@ -15,11 +15,11 @@

 #include <linux/sunrpc/stats.h>
 #include <linux/sunrpc/svcsock.h>
-#include <linux/nfsd/nfsd.h>
-#include <linux/nfsd/cache.h>
 #include <linux/lockd/bind.h>
 #include <linux/nfsacl.h>
 #include <linux/seq_file.h>
+#include "nfsd.h"
+#include "cache.h"
 #include "vfs.h"

 #define NFSDDBG_FACILITY	NFSDDBG_SVC
--- a/fs/nfsd/nfsxdr.c
+++ b/fs/nfsd/nfsxdr.c
@ -6,7 +6,7 @@
 * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de>
 */

-#include <linux/nfsd/xdr.h>
+#include "xdr.h"
 #include "auth.h"

 #define NFSDDBG_FACILITY		NFSDDBG_XDR
--- a/include/linux/nfsd/state.h
+++ b/include/linux/nfsd/state.h
--- a/fs/nfsd/stats.c
+++ b/fs/nfsd/stats.c
@ -25,11 +25,11 @@

 #include <linux/seq_file.h>
 #include <linux/module.h>
-
 #include <linux/sunrpc/stats.h>
-#include <linux/nfsd/nfsd.h>
 #include <linux/nfsd/stats.h>

+#include "nfsd.h"
+
 struct nfsd_stats	nfsdstats;
 struct svc_stat		nfsd_svcstats = {
 	.program	= &nfsd_program,
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@ -22,23 +22,25 @@
 #include <linux/fcntl.h>
 #include <linux/namei.h>
 #include <linux/delay.h>
-#include <linux/nfsd/nfsd.h>
-#ifdef CONFIG_NFSD_V3
-#include <linux/nfsd/xdr3.h>
-#endif /* CONFIG_NFSD_V3 */
 #include <linux/quotaops.h>
 #include <linux/fsnotify.h>
 #include <linux/posix_acl_xattr.h>
 #include <linux/xattr.h>
+#include <linux/jhash.h>
+#include <linux/ima.h>
+#include <asm/uaccess.h>
+
+#ifdef CONFIG_NFSD_V3
+#include "xdr3.h"
+#endif /* CONFIG_NFSD_V3 */
+
 #ifdef CONFIG_NFSD_V4
 #include <linux/nfs4_acl.h>
 #include <linux/nfsd_idmap.h>
 #endif /* CONFIG_NFSD_V4 */
-#include <linux/jhash.h>
-#include <linux/ima.h>
-#include "vfs.h"

-#include <asm/uaccess.h>
+#include "nfsd.h"
+#include "vfs.h"

 #define NFSDDBG_FACILITY		NFSDDBG_FILEOP

--- a/include/linux/nfsd/xdr.h
+++ b/include/linux/nfsd/xdr.h
@ -8,7 +8,7 @@
 #define LINUX_NFSD_H

 #include <linux/vfs.h>
-#include <linux/nfsd/nfsd.h>
+#include "nfsd.h"

 struct nfsd_fhandle {
 	struct svc_fh		fh;
--- a/include/linux/nfsd/xdr3.h
+++ b/include/linux/nfsd/xdr3.h
@ -9,7 +9,7 @@
 #ifndef _LINUX_NFSD_XDR3_H
 #define _LINUX_NFSD_XDR3_H

-#include <linux/nfsd/xdr.h>
+#include "xdr.h"

 struct nfsd3_sattrargs {
 	struct svc_fh		fh;
--- a/include/linux/nfsd/xdr4.h
+++ b/include/linux/nfsd/xdr4.h
@ -39,8 +39,8 @@
 #ifndef _LINUX_NFSD_XDR4_H
 #define _LINUX_NFSD_XDR4_H

-#include <linux/nfsd/state.h>
-#include <linux/nfsd/nfsd.h>
+#include "state.h"
+#include "nfsd.h"

 #define NFSD4_MAX_TAGLEN	128
 #define XDR_LEN(n)                     (((n) + 3) & ~3)