remove unneeded nfsd #includes

PATCH In review Boaz Harrosh 6 participants 25 messages Nov 24, 2009 – Dec 3, 2009

Subsystems (6)

VFS NFS client NFS server s390 +2 more subsystems

lore

Share & tools

lore

Boaz Harrosh

author

2009-11-24 17:58 UTC #0 lore raw

PATCH 1/1 remove unneeded nfsd #includes

Some arch files had unneeded #includes directives from linux/nfsd/*. Some vfs files had unneeded #includes directives from linux/nfsd/*.

In an effort to move some of the now public nfsd headers to the source directory, submitted a cleanup.

I have cross compiled sparc64 and s390, parsic needs testing. Please ARCH people sends ACKs, or take these patches through your trees.

patches:
[PATCH 1/5] parsic: remove unused nfsd #includes
Some kind soul, please compile with this patch? compile is all that's needed.

[PATCH 2/5] sparc: remove unused nfsd #includes
[PATCH 3/5] s390: remove unused nfsd #includes
These two were cross compiled. Should we submit them through nfsd tree or the ARCH trees?

[PATCH 4/5] vfs: nfsctl.c unused nfsd #includes [PATCH 5/5] lockd: Remove unused nfsd headers #includes
Can these patches go through the nfsd tree? Who's ACKs should we collect? Andrew?

Bruce Hi
With this set applied, the only nfsd files used publicly are:
const.h export.h nfsfh.h stats.h syscall.h

These files can be moved to source folder:
cache.h debug.h nfsd.h state.h xdr3.h xdr4.h xdr.h

Why is debug.h exported from Kernel? (include/linux/nfsd/Kbuild)

So just to see how this move might look like see last patch:
[RFC] nfsd: Move private headers to source directory

	This patch was compiled, as well, on x86(32/64), sparc64, s390

Thanks
Boaz
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

Boaz Harrosh

author

2009-11-24 17:59 UTC #1 lore raw

PATCH 1/5 parsic: remove unused nfsd #includes

Some unused includes removed.

This patch is in an effort to cleanup nfsd headers and move private definitions to source directory.

Signed-off-by Boaz Harrosh <[email protected]>

---
 arch/parisc/kernel/sys_parisc32.c |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

arch/parisc/kernel/sys_parisc32.c +0 -6

index 561388b..4a8ca63 100644
@@ -26,13 +26,7 @@
 #include <linux/shm.h>
 #include <linux/slab.h>
 #include <linux/uio.h>
-#include <linux/nfs_fs.h>
 #include <linux/ncp_fs.h>
-#include <linux/sunrpc/svc.h>
-#include <linux/nfsd/nfsd.h>
-#include <linux/nfsd/cache.h>
-#include <linux/nfsd/xdr.h>
-#include <linux/nfsd/syscall.h>
 #include <linux/poll.h>
 #include <linux/personality.h>
 #include <linux/stat.h>

Signature · 1 line

1.6.5.2

Boaz Harrosh

author

2009-11-24 18:01 UTC #5 lore raw

PATCH 2/5 sparc: remove unused nfsd #includes

In reply to Boaz Harrosh

Some unused includes removed.

In an effort to cleanup nfsd headers and move private definitions to source directory.

Signed-off-by Boaz Harrosh <[email protected]>

---
 arch/sparc/kernel/sys_sparc32.c |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

arch/sparc/kernel/sys_sparc32.c +0 -5

index 04e28b2..0a68fdf 100644
@@ -26,11 +26,6 @@
 #include <linux/nfs_fs.h>
 #include <linux/quota.h>
 #include <linux/module.h>
-#include <linux/sunrpc/svc.h>
-#include <linux/nfsd/nfsd.h>
-#include <linux/nfsd/cache.h>
-#include <linux/nfsd/xdr.h>
-#include <linux/nfsd/syscall.h>
 #include <linux/poll.h>
 #include <linux/personality.h>
 #include <linux/stat.h>

Signature · 7 lines

1.6.5.2


--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Boaz Harrosh

author

2009-11-24 18:01 UTC #4 lore raw

PATCH 1/5 parsic: remove unused nfsd #includes

In reply to Boaz Harrosh

Some unused includes removed.

This patch is in an effort to cleanup nfsd headers and move private definitions to source directory.

Signed-off-by Boaz Harrosh <[email protected]>

---
 arch/parisc/kernel/sys_parisc32.c |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

arch/parisc/kernel/sys_parisc32.c +0 -6

index 561388b..4a8ca63 100644
@@ -26,13 +26,7 @@
 #include <linux/shm.h>
 #include <linux/slab.h>
 #include <linux/uio.h>
-#include <linux/nfs_fs.h>
 #include <linux/ncp_fs.h>
-#include <linux/sunrpc/svc.h>
-#include <linux/nfsd/nfsd.h>
-#include <linux/nfsd/cache.h>
-#include <linux/nfsd/xdr.h>
-#include <linux/nfsd/syscall.h>
 #include <linux/poll.h>
 #include <linux/personality.h>
 #include <linux/stat.h>

Signature · 1 line

1.6.5.2

Boaz Harrosh

author

2009-11-24 18:02 UTC #7 lore raw

PATCH 3/5 s390: remove unused nfsd #includes

In reply to Boaz Harrosh

Some unused includes removed.

This patch is in an effort to cleanup nfsd headers and move private definitions to source directory.

Signed-off-by Boaz Harrosh <[email protected]>

---
 arch/s390/kernel/compat_linux.c |    6 ------
 arch/s390/kernel/compat_linux.h |    4 ----
 2 files changed, 0 insertions(+), 10 deletions(-)

arch/s390/kernel/compat_linux.c +0 -6

index 0debcec..29a2f34 100644
@@ -31,14 +31,8 @@
 #include <linux/shm.h>
 #include <linux/slab.h>
 #include <linux/uio.h>
-#include <linux/nfs_fs.h>
 #include <linux/quota.h>
 #include <linux/module.h>
-#include <linux/sunrpc/svc.h>
-#include <linux/nfsd/nfsd.h>
-#include <linux/nfsd/cache.h>
-#include <linux/nfsd/xdr.h>
-#include <linux/nfsd/syscall.h>
 #include <linux/poll.h>
 #include <linux/personality.h>
 #include <linux/stat.h>

arch/s390/kernel/compat_linux.h +0 -4

index c07f9ca..81d6ee8 100644
@@ -4,10 +4,6 @@
 #include <linux/compat.h>
 #include <linux/socket.h>
 #include <linux/syscalls.h>
-#include <linux/nfs_fs.h>
-#include <linux/sunrpc/svc.h>
-#include <linux/nfsd/nfsd.h>
-#include <linux/nfsd/export.h>
 
 /* Macro that masks the high order bit of an 32 bit pointer and converts it*/
 /*       to a 64 bit pointer */

Signature · 1 line

1.6.5.2

Boaz Harrosh

author

2009-11-24 18:03 UTC #10 lore raw

PATCH 4/5 lockd: Remove unused nfsd headers #includes

In reply to Boaz Harrosh

In what history where these ever needed? Well not
any more.

Signed-off-by Boaz Harrosh <[email protected]>

---
 fs/lockd/svc4proc.c |    4 ----
 fs/lockd/svcproc.c  |    4 ----
 2 files changed, 0 insertions(+), 8 deletions(-)

fs/lockd/svc4proc.c +0 -4

index bd173a6..a7966ee 100644
@@ -11,10 +11,6 @@
 #include <linux/time.h>
 #include <linux/slab.h>
 #include <linux/smp_lock.h>
-#include <linux/in.h>
-#include <linux/sunrpc/svc.h>
-#include <linux/sunrpc/clnt.h>
-#include <linux/nfsd/nfsd.h>
 #include <linux/lockd/lockd.h>
 #include <linux/lockd/share.h>

fs/lockd/svcproc.c +0 -4

index e1d28dd..56c9519 100644
@@ -11,10 +11,6 @@
 #include <linux/time.h>
 #include <linux/slab.h>
 #include <linux/smp_lock.h>
-#include <linux/in.h>
-#include <linux/sunrpc/svc.h>
-#include <linux/sunrpc/clnt.h>
-#include <linux/nfsd/nfsd.h>
 #include <linux/lockd/lockd.h>
 #include <linux/lockd/share.h>

Signature · 1 line

1.6.5.2

Boaz Harrosh

author

2009-11-24 18:04 UTC #18 lore raw

PATCH 5/5 vfs: nfsctl.c unused nfsd #includes

In reply to Boaz Harrosh

Only linux/nfsd/syscall.h is actually used. Remove the other nfsd #includes, so they can be moved to source directory.

Signed-off-by Boaz Harrosh <[email protected]>

---
 fs/nfsctl.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

fs/nfsctl.c +0 -2

index 8f9a205..d3854d9 100644
@@ -7,8 +7,6 @@
 #include <linux/types.h>
 #include <linux/file.h>
 #include <linux/fs.h>
-#include <linux/sunrpc/svc.h>
-#include <linux/nfsd/nfsd.h>
 #include <linux/nfsd/syscall.h>
 #include <linux/cred.h>
 #include <linux/sched.h>

Signature · 1 line

1.6.5.2

Boaz Harrosh

author

2009-11-24 18:05 UTC #15 lore raw

RFC 1/1 nfsd: Move private headers to source directory

In reply to Boaz Harrosh

Lots of include/linux/nfsd/* headers are only used by nfsd module. Move them to the source directory

Signed-off-by Boaz Harrosh <[email protected]>

---
 fs/nfsd/auth.c                     |    2 +-
 {include/linux => fs}/nfsd/cache.h |    0
 fs/nfsd/export.c                   |    3 ++-
 fs/nfsd/lockd.c                    |    2 +-
 fs/nfsd/nfs2acl.c                  |    7 ++++---
 fs/nfsd/nfs3acl.c                  |    7 ++++---
 fs/nfsd/nfs3proc.c                 |    4 ++--
 fs/nfsd/nfs3xdr.c                  |    2 +-
 fs/nfsd/nfs4callback.c             |    4 ++--
 fs/nfsd/nfs4proc.c                 |    4 ++--
 fs/nfsd/nfs4recover.c              |    5 +++--
 fs/nfsd/nfs4state.c                |    2 +-
 fs/nfsd/nfs4xdr.c                  |    3 ++-
 fs/nfsd/nfscache.c                 |    4 ++--
 fs/nfsd/nfsctl.c                   |    5 +++--
 {include/linux => fs}/nfsd/nfsd.h  |    0
 fs/nfsd/nfsfh.c                    |    2 +-
 fs/nfsd/nfsproc.c                  |    4 ++--
 fs/nfsd/nfssvc.c                   |    4 ++--
 fs/nfsd/nfsxdr.c                   |    2 +-
 {include/linux => fs}/nfsd/state.h |    0
 fs/nfsd/stats.c                    |    4 ++--
 fs/nfsd/vfs.c                      |   18 ++++++++++--------
 {include/linux => fs}/nfsd/xdr.h   |    2 +-
 {include/linux => fs}/nfsd/xdr3.h  |    2 +-
 {include/linux => fs}/nfsd/xdr4.h  |    4 ++--
 26 files changed, 52 insertions(+), 44 deletions(-)
 rename {include/linux => fs}/nfsd/cache.h (100%)
 rename {include/linux => fs}/nfsd/nfsd.h (100%)
 rename {include/linux => fs}/nfsd/state.h (100%)
 rename {include/linux => fs}/nfsd/xdr.h (99%)
 rename {include/linux => fs}/nfsd/xdr3.h (99%)
 rename {include/linux => fs}/nfsd/xdr4.h (99%)

fs/nfsd/auth.c +1 -1

index ad354d2..71209d4 100644
@@ -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)

fs/nfsd/cache.h renamed from include/linux/nfsd/cache.h +0 -0

similarity index 100%
rename from include/linux/nfsd/cache.h
rename to fs/nfsd/cache.h

fs/nfsd/export.c +2 -1

index 68e63f4..cb3dae2 100644
@@ -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;

fs/nfsd/lockd.c +1 -1

index 801ef71..6f12777 100644
@@ -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

fs/nfsd/nfs2acl.c +4 -3

index a54628d..874e2a9 100644
@@ -6,10 +6,11 @@
  * Copyright (C) 2002-2003 Andreas Gruenbacher <[email protected]>
  */
 
-#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

fs/nfsd/nfs3acl.c +4 -3

index 2f5c61b..c6011dd 100644
@@ -6,10 +6,11 @@
  * Copyright (C) 2002-2003 Andreas Gruenbacher <[email protected]>
  */
 
-#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); }

fs/nfsd/nfs3proc.c +2 -2

index b694b43..90b19ca 100644
@@ -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

fs/nfsd/nfs3xdr.c +1 -1

index 623e13a..c523bb8 100644
@@ -9,7 +9,7 @@
  */
 
 #include <linux/namei.h>
-#include <linux/nfsd/xdr3.h>
+#include "xdr3.h"
 #include "auth.h"
 
 #define NFSDDBG_FACILITY		NFSDDBG_XDR

fs/nfsd/nfs4callback.c +2 -2

index 4fe3960..f7a3158 100644
@@ -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

fs/nfsd/nfs4proc.c +2 -2

index d0e04cb..f8a37c4 100644
@@ -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

fs/nfsd/nfs4recover.c +3 -2

index 48742f2..6744e7f 100644
@@ -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

fs/nfsd/nfs4state.c +1 -1

index 1fe6e29..2923e6c 100644
@@ -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

fs/nfsd/nfs4xdr.c +2 -1

index 2fa9682..cab9780 100644
@@ -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

fs/nfsd/nfscache.c +2 -2

index 96694b8..18aa972 100644
@@ -10,8 +10,8 @@
  * Copyright (C) 1995, 1996 Olaf Kirch <[email protected]>
  */
 
-#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

fs/nfsd/nfsctl.c +3 -2

index e4f49fd..0415680 100644
@@ -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.
  */

fs/nfsd/nfsd.h renamed from include/linux/nfsd/nfsd.h +0 -0

similarity index 100%
rename from include/linux/nfsd/nfsd.h
rename to fs/nfsd/nfsd.h

fs/nfsd/nfsfh.c +1 -1

index 4ef4601..2bf9efb 100644
@@ -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"

fs/nfsd/nfsproc.c +2 -2

index b6bd9e0..21a5f79 100644
@@ -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;

fs/nfsd/nfssvc.c +2 -2

index b2d7ffa..b520ce1 100644
@@ -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

fs/nfsd/nfsxdr.c +1 -1

index 5e0603d..3bec831 100644
@@ -6,7 +6,7 @@
  * Copyright (C) 1995, 1996 Olaf Kirch <[email protected]>
  */
 
-#include <linux/nfsd/xdr.h>
+#include "xdr.h"
 #include "auth.h"
 
 #define NFSDDBG_FACILITY		NFSDDBG_XDR

fs/nfsd/state.h renamed from include/linux/nfsd/state.h +0 -0

similarity index 100%
rename from include/linux/nfsd/state.h
rename to fs/nfsd/state.h

fs/nfsd/stats.c +2 -2

index e3e411e..3fc69df 100644
@@ -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,

fs/nfsd/vfs.c +10 -8

index 81ce108..04bdba1 100644
@@ -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

fs/nfsd/xdr.h renamed from include/linux/nfsd/xdr.h +1 -1

similarity index 99%
rename from include/linux/nfsd/xdr.h
rename to fs/nfsd/xdr.h
index 58f824d..235ee5c 100644
@@ -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;

fs/nfsd/xdr3.h renamed from include/linux/nfsd/xdr3.h +1 -1

similarity index 99%
rename from include/linux/nfsd/xdr3.h
rename to fs/nfsd/xdr3.h
index 421eddd..b330756 100644
@@ -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;

fs/nfsd/xdr4.h renamed from include/linux/nfsd/xdr4.h +2 -2

similarity index 99%
rename from include/linux/nfsd/xdr4.h
rename to fs/nfsd/xdr4.h
index 1bf2662..83202a1 100644
@@ -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)

Signature · 1 line

1.6.5.2

Boaz Harrosh

author

2009-11-24 18:16 UTC #9 lore raw

PATCH 3/5 s390: remove unused nfsd #includes

In reply to Boaz Harrosh

Some unused includes removed.

This patch is in an effort to cleanup nfsd headers and move private definitions to source directory.

Signed-off-by Boaz Harrosh <[email protected]>

---
 arch/s390/kernel/compat_linux.c |    6 ------
 arch/s390/kernel/compat_linux.h |    4 ----
 2 files changed, 0 insertions(+), 10 deletions(-)

arch/s390/kernel/compat_linux.c +0 -6

index 0debcec..29a2f34 100644
@@ -31,14 +31,8 @@
 #include <linux/shm.h>
 #include <linux/slab.h>
 #include <linux/uio.h>
-#include <linux/nfs_fs.h>
 #include <linux/quota.h>
 #include <linux/module.h>
-#include <linux/sunrpc/svc.h>
-#include <linux/nfsd/nfsd.h>
-#include <linux/nfsd/cache.h>
-#include <linux/nfsd/xdr.h>
-#include <linux/nfsd/syscall.h>
 #include <linux/poll.h>
 #include <linux/personality.h>
 #include <linux/stat.h>

arch/s390/kernel/compat_linux.h +0 -4

index c07f9ca..81d6ee8 100644
@@ -4,10 +4,6 @@
 #include <linux/compat.h>
 #include <linux/socket.h>
 #include <linux/syscalls.h>
-#include <linux/nfs_fs.h>
-#include <linux/sunrpc/svc.h>
-#include <linux/nfsd/nfsd.h>
-#include <linux/nfsd/export.h>
 
 /* Macro that masks the high order bit of an 32 bit pointer and converts it*/
 /*       to a 64 bit pointer */

Signature · 1 line

1.6.5.2

Boaz Harrosh

author

2009-11-24 18:16 UTC #17 lore raw

PATCH 4/5 lockd: Remove unused nfsd headers #includes

In reply to Boaz Harrosh

In what history where these ever needed? Well not
any more.

Signed-off-by Boaz Harrosh <[email protected]>

---
 fs/lockd/svc4proc.c |    4 ----
 fs/lockd/svcproc.c  |    4 ----
 2 files changed, 0 insertions(+), 8 deletions(-)

fs/lockd/svc4proc.c +0 -4

index bd173a6..a7966ee 100644
@@ -11,10 +11,6 @@
 #include <linux/time.h>
 #include <linux/slab.h>
 #include <linux/smp_lock.h>
-#include <linux/in.h>
-#include <linux/sunrpc/svc.h>
-#include <linux/sunrpc/clnt.h>
-#include <linux/nfsd/nfsd.h>
 #include <linux/lockd/lockd.h>
 #include <linux/lockd/share.h>

fs/lockd/svcproc.c +0 -4

index e1d28dd..56c9519 100644
@@ -11,10 +11,6 @@
 #include <linux/time.h>
 #include <linux/slab.h>
 #include <linux/smp_lock.h>
-#include <linux/in.h>
-#include <linux/sunrpc/svc.h>
-#include <linux/sunrpc/clnt.h>
-#include <linux/nfsd/nfsd.h>
 #include <linux/lockd/lockd.h>
 #include <linux/lockd/share.h>

Signature · 1 line

1.6.5.2

Boaz Harrosh

author

2009-11-24 18:16 UTC #20 lore raw

PATCH 5/5 vfs: nfsctl.c unused nfsd #includes

In reply to Boaz Harrosh

Only linux/nfsd/syscall.h is actually used. Remove the other nfsd #includes, so they can be moved to source directory.

Signed-off-by Boaz Harrosh <[email protected]>

---
 fs/nfsctl.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

fs/nfsctl.c +0 -2

index 8f9a205..d3854d9 100644
@@ -7,8 +7,6 @@
 #include <linux/types.h>
 #include <linux/file.h>
 #include <linux/fs.h>
-#include <linux/sunrpc/svc.h>
-#include <linux/nfsd/nfsd.h>
 #include <linux/nfsd/syscall.h>
 #include <linux/cred.h>
 #include <linux/sched.h>

Signature · 1 line

1.6.5.2

Boaz Harrosh

author

2009-11-24 18:16 UTC #21 lore raw

RFC 1/1 nfsd: Move private headers to source directory

In reply to Boaz Harrosh

Lots of include/linux/nfsd/* headers are only used by nfsd module. Move them to the source directory

Signed-off-by Boaz Harrosh <[email protected]>

---
 fs/nfsd/auth.c                     |    2 +-
 {include/linux => fs}/nfsd/cache.h |    0
 fs/nfsd/export.c                   |    3 ++-
 fs/nfsd/lockd.c                    |    2 +-
 fs/nfsd/nfs2acl.c                  |    7 ++++---
 fs/nfsd/nfs3acl.c                  |    7 ++++---
 fs/nfsd/nfs3proc.c                 |    4 ++--
 fs/nfsd/nfs3xdr.c                  |    2 +-
 fs/nfsd/nfs4callback.c             |    4 ++--
 fs/nfsd/nfs4proc.c                 |    4 ++--
 fs/nfsd/nfs4recover.c              |    5 +++--
 fs/nfsd/nfs4state.c                |    2 +-
 fs/nfsd/nfs4xdr.c                  |    3 ++-
 fs/nfsd/nfscache.c                 |    4 ++--
 fs/nfsd/nfsctl.c                   |    5 +++--
 {include/linux => fs}/nfsd/nfsd.h  |    0
 fs/nfsd/nfsfh.c                    |    2 +-
 fs/nfsd/nfsproc.c                  |    4 ++--
 fs/nfsd/nfssvc.c                   |    4 ++--
 fs/nfsd/nfsxdr.c                   |    2 +-
 {include/linux => fs}/nfsd/state.h |    0
 fs/nfsd/stats.c                    |    4 ++--
 fs/nfsd/vfs.c                      |   18 ++++++++++--------
 {include/linux => fs}/nfsd/xdr.h   |    2 +-
 {include/linux => fs}/nfsd/xdr3.h  |    2 +-
 {include/linux => fs}/nfsd/xdr4.h  |    4 ++--
 26 files changed, 52 insertions(+), 44 deletions(-)
 rename {include/linux => fs}/nfsd/cache.h (100%)
 rename {include/linux => fs}/nfsd/nfsd.h (100%)
 rename {include/linux => fs}/nfsd/state.h (100%)
 rename {include/linux => fs}/nfsd/xdr.h (99%)
 rename {include/linux => fs}/nfsd/xdr3.h (99%)
 rename {include/linux => fs}/nfsd/xdr4.h (99%)

fs/nfsd/auth.c +1 -1

index ad354d2..71209d4 100644
@@ -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)

fs/nfsd/cache.h renamed from include/linux/nfsd/cache.h +0 -0

similarity index 100%
rename from include/linux/nfsd/cache.h
rename to fs/nfsd/cache.h

fs/nfsd/export.c +2 -1

index 68e63f4..cb3dae2 100644
@@ -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;

fs/nfsd/lockd.c +1 -1

index 801ef71..6f12777 100644
@@ -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

fs/nfsd/nfs2acl.c +4 -3

index a54628d..874e2a9 100644
@@ -6,10 +6,11 @@
  * Copyright (C) 2002-2003 Andreas Gruenbacher <[email protected]>
  */
 
-#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

fs/nfsd/nfs3acl.c +4 -3

index 2f5c61b..c6011dd 100644
@@ -6,10 +6,11 @@
  * Copyright (C) 2002-2003 Andreas Gruenbacher <[email protected]>
  */
 
-#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); }

fs/nfsd/nfs3proc.c +2 -2

index b694b43..90b19ca 100644
@@ -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

fs/nfsd/nfs3xdr.c +1 -1

index 623e13a..c523bb8 100644
@@ -9,7 +9,7 @@
  */
 
 #include <linux/namei.h>
-#include <linux/nfsd/xdr3.h>
+#include "xdr3.h"
 #include "auth.h"
 
 #define NFSDDBG_FACILITY		NFSDDBG_XDR

fs/nfsd/nfs4callback.c +2 -2

index 4fe3960..f7a3158 100644
@@ -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

fs/nfsd/nfs4proc.c +2 -2

index d0e04cb..f8a37c4 100644
@@ -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

fs/nfsd/nfs4recover.c +3 -2

index 48742f2..6744e7f 100644
@@ -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

fs/nfsd/nfs4state.c +1 -1

index 1fe6e29..2923e6c 100644
@@ -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

fs/nfsd/nfs4xdr.c +2 -1

index 2fa9682..cab9780 100644
@@ -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

fs/nfsd/nfscache.c +2 -2

index 96694b8..18aa972 100644
@@ -10,8 +10,8 @@
  * Copyright (C) 1995, 1996 Olaf Kirch <[email protected]>
  */
 
-#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

fs/nfsd/nfsctl.c +3 -2

index e4f49fd..0415680 100644
@@ -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.
  */

fs/nfsd/nfsd.h renamed from include/linux/nfsd/nfsd.h +0 -0

similarity index 100%
rename from include/linux/nfsd/nfsd.h
rename to fs/nfsd/nfsd.h

fs/nfsd/nfsfh.c +1 -1

index 4ef4601..2bf9efb 100644
@@ -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"

fs/nfsd/nfsproc.c +2 -2

index b6bd9e0..21a5f79 100644
@@ -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;

fs/nfsd/nfssvc.c +2 -2

index b2d7ffa..b520ce1 100644
@@ -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

fs/nfsd/nfsxdr.c +1 -1

index 5e0603d..3bec831 100644
@@ -6,7 +6,7 @@
  * Copyright (C) 1995, 1996 Olaf Kirch <[email protected]>
  */
 
-#include <linux/nfsd/xdr.h>
+#include "xdr.h"
 #include "auth.h"
 
 #define NFSDDBG_FACILITY		NFSDDBG_XDR

fs/nfsd/state.h renamed from include/linux/nfsd/state.h +0 -0

similarity index 100%
rename from include/linux/nfsd/state.h
rename to fs/nfsd/state.h

fs/nfsd/stats.c +2 -2

index e3e411e..3fc69df 100644
@@ -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,

fs/nfsd/vfs.c +10 -8

index 81ce108..04bdba1 100644
@@ -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

fs/nfsd/xdr.h renamed from include/linux/nfsd/xdr.h +1 -1

similarity index 99%
rename from include/linux/nfsd/xdr.h
rename to fs/nfsd/xdr.h
index 58f824d..235ee5c 100644
@@ -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;

fs/nfsd/xdr3.h renamed from include/linux/nfsd/xdr3.h +1 -1

similarity index 99%
rename from include/linux/nfsd/xdr3.h
rename to fs/nfsd/xdr3.h
index 421eddd..b330756 100644
@@ -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;

fs/nfsd/xdr4.h renamed from include/linux/nfsd/xdr4.h +2 -2

similarity index 99%
rename from include/linux/nfsd/xdr4.h
rename to fs/nfsd/xdr4.h
index 1bf2662..83202a1 100644
@@ -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)

Signature · 1 line

1.6.5.2

Grant Grundler

Tested-by on v1 1/1

2009-11-24 21:27 UTC #22 lore raw

In reply to Boaz Harrosh

Quoted 2 lines · Boaz Harrosh

Some arch files had unneeded #includes directives from linux/nfsd/*. Some vfs files had unneeded #includes directives from linux/nfsd/*.

...

Quoted 4 lines

patches:
[PATCH 1/5] parsic: remove unused nfsd #includes
Some kind soul, please compile with this patch? compile is all that's needed.

Boaz,
linux-2.6 compiles for parisc with this patch. Please add:

Tested-by Grant Grundler <[email protected]>

thanks,
grant

Quoted 30 lines

[PATCH 2/5] sparc: remove unused nfsd #includes
[PATCH 3/5] s390: remove unused nfsd #includes
These two were cross compiled. Should we submit them through nfsd tree or the ARCH trees?
[PATCH 4/5] vfs: nfsctl.c unused nfsd #includes [PATCH 5/5] lockd: Remove unused nfsd headers #includes
Can these patches go through the nfsd tree? Who's ACKs should we collect? Andrew?
Bruce Hi
With this set applied, the only nfsd files used publicly are:
const.h export.h nfsfh.h stats.h syscall.h
These files can be moved to source folder:
cache.h debug.h nfsd.h state.h xdr3.h xdr4.h xdr.h
Why is debug.h exported from Kernel? (include/linux/nfsd/Kbuild)
So just to see how this move might look like see last patch:
[RFC] nfsd: Move private headers to source directory
	This patch was compiled, as well, on x86(32/64), sparc64, s390
Thanks
Boaz
--
To unsubscribe from this list: send the line "unsubscribe linux-parisc" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

J. Bruce Fields

2009-11-24 23:08 UTC #23 lore raw

In reply to Boaz Harrosh

Quoted 1 line · Boaz Harrosh

Why is debug.h exported from Kernel? (include/linux/nfsd/Kbuild)

I suppose it's so rpcdebug can get the rpc debug flags; see e.g. nfs-utils/tools/rpcdebug/rpcdebug.c.

--b.

Martin Schwidefsky

2009-11-25 08:38 UTC #8 lore raw

Re: [PATCH 3/5] s390: remove unused nfsd #includes

In reply to Boaz Harrosh

Quoted 10 lines · On Tue, 24 Nov 2009 20:02:00 +0200 Boaz Harrosh <[email protected]> wrote:

Some unused includes removed.
This patch is in an effort to cleanup nfsd headers and move private definitions to source directory.
Signed-off-by Boaz Harrosh <[email protected]>
---
 arch/s390/kernel/compat_linux.c |    6 ------
 arch/s390/kernel/compat_linux.h |    4 ----
 2 files changed, 0 insertions(+), 10 deletions(-)

The patch is fine. I'll add it to the feature branch of git390 for the next merge window.

Signature · 4 lines

blue skies,
   Martin.

"Reality continues to ruin my life." - Calvin.

Boaz Harrosh

author

2009-11-25 08:42 UTC #24 lore raw

In reply to J. Bruce Fields

Quoted 6 lines · J. Bruce Fields

Quoted 1 line · Boaz Harrosh
Why is debug.h exported from Kernel? (include/linux/nfsd/Kbuild)
I suppose it's so rpcdebug can get the rpc debug flags; see e.g. nfs-utils/tools/rpcdebug/rpcdebug.c.

OK, thanks, so I didn't touch it

Quoted 1 line

--b.

J. Bruce Fields

Applied

2009-11-25 20:09 UTC #11 lore raw

Re: [PATCH 4/5] lockd: Remove unused nfsd headers #includes

In reply to Boaz Harrosh

Quoted 3 lines · Boaz Harrosh

In what history where these ever needed? Well not
any more.

Applied, thanks.--b.

Quoted 41 lines

Signed-off-by Boaz Harrosh <[email protected]>

---
 fs/lockd/svc4proc.c |    4 ----
 fs/lockd/svcproc.c  |    4 ----
 2 files changed, 0 insertions(+), 8 deletions(-)

fs/lockd/svc4proc.c +0 -4

index bd173a6..a7966ee 100644
@@ -11,10 +11,6 @@
 #include <linux/time.h>
 #include <linux/slab.h>
 #include <linux/smp_lock.h>
-#include <linux/in.h>
-#include <linux/sunrpc/svc.h>
-#include <linux/sunrpc/clnt.h>
-#include <linux/nfsd/nfsd.h>
 #include <linux/lockd/lockd.h>
 #include <linux/lockd/share.h>

fs/lockd/svcproc.c +0 -4

index e1d28dd..56c9519 100644
@@ -11,10 +11,6 @@
 #include <linux/time.h>
 #include <linux/slab.h>
 #include <linux/smp_lock.h>
-#include <linux/in.h>
-#include <linux/sunrpc/svc.h>
-#include <linux/sunrpc/clnt.h>
-#include <linux/nfsd/nfsd.h>
 #include <linux/lockd/lockd.h>
 #include <linux/lockd/share.h>

Signature · 1 line

1.6.5.2

J. Bruce Fields

2009-11-25 20:12 UTC #19 lore raw

Re: [PATCH 5/5] vfs: nfsctl.c unused nfsd #includes

In reply to Boaz Harrosh

Quoted 4 lines · Boaz Harrosh

Only linux/nfsd/syscall.h is actually used. Remove the other nfsd #includes, so they can be moved to source directory.

I guess I'll take this one too.

The arch-specific ones I'm assuming are someone else's problem unless I hear otherwise.

--b.

Quoted 23 lines

Signed-off-by Boaz Harrosh <[email protected]>

---
 fs/nfsctl.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

fs/nfsctl.c +0 -2

index 8f9a205..d3854d9 100644
@@ -7,8 +7,6 @@
 #include <linux/types.h>
 #include <linux/file.h>
 #include <linux/fs.h>
-#include <linux/sunrpc/svc.h>
-#include <linux/nfsd/nfsd.h>
 #include <linux/nfsd/syscall.h>
 #include <linux/cred.h>
 #include <linux/sched.h>

Signature · 1 line

1.6.5.2

J. Bruce Fields

2009-11-25 20:13 UTC #16 lore raw

Re: [RFC] nfsd: Move private headers to source directory

In reply to Boaz Harrosh

Quoted 3 lines · Boaz Harrosh

Lots of include/linux/nfsd/* headers are only used by nfsd module. Move them to the source directory

Fine by me; I guess just resubmit this after the others go in.

--b.

Quoted 447 lines

Signed-off-by Boaz Harrosh <[email protected]>

---
 fs/nfsd/auth.c                     |    2 +-
 {include/linux => fs}/nfsd/cache.h |    0
 fs/nfsd/export.c                   |    3 ++-
 fs/nfsd/lockd.c                    |    2 +-
 fs/nfsd/nfs2acl.c                  |    7 ++++---
 fs/nfsd/nfs3acl.c                  |    7 ++++---
 fs/nfsd/nfs3proc.c                 |    4 ++--
 fs/nfsd/nfs3xdr.c                  |    2 +-
 fs/nfsd/nfs4callback.c             |    4 ++--
 fs/nfsd/nfs4proc.c                 |    4 ++--
 fs/nfsd/nfs4recover.c              |    5 +++--
 fs/nfsd/nfs4state.c                |    2 +-
 fs/nfsd/nfs4xdr.c                  |    3 ++-
 fs/nfsd/nfscache.c                 |    4 ++--
 fs/nfsd/nfsctl.c                   |    5 +++--
 {include/linux => fs}/nfsd/nfsd.h  |    0
 fs/nfsd/nfsfh.c                    |    2 +-
 fs/nfsd/nfsproc.c                  |    4 ++--
 fs/nfsd/nfssvc.c                   |    4 ++--
 fs/nfsd/nfsxdr.c                   |    2 +-
 {include/linux => fs}/nfsd/state.h |    0
 fs/nfsd/stats.c                    |    4 ++--
 fs/nfsd/vfs.c                      |   18 ++++++++++--------
 {include/linux => fs}/nfsd/xdr.h   |    2 +-
 {include/linux => fs}/nfsd/xdr3.h  |    2 +-
 {include/linux => fs}/nfsd/xdr4.h  |    4 ++--
 26 files changed, 52 insertions(+), 44 deletions(-)
 rename {include/linux => fs}/nfsd/cache.h (100%)
 rename {include/linux => fs}/nfsd/nfsd.h (100%)
 rename {include/linux => fs}/nfsd/state.h (100%)
 rename {include/linux => fs}/nfsd/xdr.h (99%)
 rename {include/linux => fs}/nfsd/xdr3.h (99%)
 rename {include/linux => fs}/nfsd/xdr4.h (99%)

fs/nfsd/auth.c +1 -1

index ad354d2..71209d4 100644
@@ -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)

fs/nfsd/cache.h renamed from include/linux/nfsd/cache.h +0 -0

similarity index 100%
rename from include/linux/nfsd/cache.h
rename to fs/nfsd/cache.h

fs/nfsd/export.c +2 -1

index 68e63f4..cb3dae2 100644
@@ -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;

fs/nfsd/lockd.c +1 -1

index 801ef71..6f12777 100644
@@ -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

fs/nfsd/nfs2acl.c +4 -3

index a54628d..874e2a9 100644
@@ -6,10 +6,11 @@
  * Copyright (C) 2002-2003 Andreas Gruenbacher <[email protected]>
  */
 
-#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

fs/nfsd/nfs3acl.c +4 -3

index 2f5c61b..c6011dd 100644
@@ -6,10 +6,11 @@
  * Copyright (C) 2002-2003 Andreas Gruenbacher <[email protected]>
  */
 
-#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); }

fs/nfsd/nfs3proc.c +2 -2

index b694b43..90b19ca 100644
@@ -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

fs/nfsd/nfs3xdr.c +1 -1

index 623e13a..c523bb8 100644
@@ -9,7 +9,7 @@
  */
 
 #include <linux/namei.h>
-#include <linux/nfsd/xdr3.h>
+#include "xdr3.h"
 #include "auth.h"
 
 #define NFSDDBG_FACILITY		NFSDDBG_XDR

fs/nfsd/nfs4callback.c +2 -2

index 4fe3960..f7a3158 100644
@@ -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

fs/nfsd/nfs4proc.c +2 -2

index d0e04cb..f8a37c4 100644
@@ -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

fs/nfsd/nfs4recover.c +3 -2

index 48742f2..6744e7f 100644
@@ -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

fs/nfsd/nfs4state.c +1 -1

index 1fe6e29..2923e6c 100644
@@ -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

fs/nfsd/nfs4xdr.c +2 -1

index 2fa9682..cab9780 100644
@@ -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

fs/nfsd/nfscache.c +2 -2

index 96694b8..18aa972 100644
@@ -10,8 +10,8 @@
  * Copyright (C) 1995, 1996 Olaf Kirch <[email protected]>
  */
 
-#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

fs/nfsd/nfsctl.c +3 -2

index e4f49fd..0415680 100644
@@ -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.
  */

fs/nfsd/nfsd.h renamed from include/linux/nfsd/nfsd.h +0 -0

similarity index 100%
rename from include/linux/nfsd/nfsd.h
rename to fs/nfsd/nfsd.h

fs/nfsd/nfsfh.c +1 -1

index 4ef4601..2bf9efb 100644
@@ -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"

fs/nfsd/nfsproc.c +2 -2

index b6bd9e0..21a5f79 100644
@@ -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;

fs/nfsd/nfssvc.c +2 -2

index b2d7ffa..b520ce1 100644
@@ -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

fs/nfsd/nfsxdr.c +1 -1

index 5e0603d..3bec831 100644
@@ -6,7 +6,7 @@
  * Copyright (C) 1995, 1996 Olaf Kirch <[email protected]>
  */
 
-#include <linux/nfsd/xdr.h>
+#include "xdr.h"
 #include "auth.h"
 
 #define NFSDDBG_FACILITY		NFSDDBG_XDR

fs/nfsd/state.h renamed from include/linux/nfsd/state.h +0 -0

similarity index 100%
rename from include/linux/nfsd/state.h
rename to fs/nfsd/state.h

fs/nfsd/stats.c +2 -2

index e3e411e..3fc69df 100644
@@ -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,

fs/nfsd/vfs.c +10 -8

index 81ce108..04bdba1 100644
@@ -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

fs/nfsd/xdr.h renamed from include/linux/nfsd/xdr.h +1 -1

similarity index 99%
rename from include/linux/nfsd/xdr.h
rename to fs/nfsd/xdr.h
index 58f824d..235ee5c 100644
@@ -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;

fs/nfsd/xdr3.h renamed from include/linux/nfsd/xdr3.h +1 -1

similarity index 99%
rename from include/linux/nfsd/xdr3.h
rename to fs/nfsd/xdr3.h
index 421eddd..b330756 100644
@@ -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;

fs/nfsd/xdr4.h renamed from include/linux/nfsd/xdr4.h +2 -2

similarity index 99%
rename from include/linux/nfsd/xdr4.h
rename to fs/nfsd/xdr4.h
index 1bf2662..83202a1 100644
@@ -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)

Signature · 1 line

1.6.5.2

J. Bruce Fields

2009-11-25 20:22 UTC #12 lore raw

Re: [PATCH 4/5] lockd: Remove unused nfsd headers #includes

In reply to J. Bruce Fields

Quoted 6 lines · J. Bruce Fields

Quoted 3 lines · Boaz Harrosh
In what history where these ever needed? Well not
any more.
Applied, thanks.--b.

Um, I said that before I actually tried to compile it.... OK, dropping for now (assuming I'm missing some earlier patch).

--b.

Quoted 42 lines

Signed-off-by Boaz Harrosh <[email protected]>

---
 fs/lockd/svc4proc.c |    4 ----
 fs/lockd/svcproc.c  |    4 ----
 2 files changed, 0 insertions(+), 8 deletions(-)

fs/lockd/svc4proc.c +0 -4

index bd173a6..a7966ee 100644
@@ -11,10 +11,6 @@
 #include <linux/time.h>
 #include <linux/slab.h>
 #include <linux/smp_lock.h>
-#include <linux/in.h>
-#include <linux/sunrpc/svc.h>
-#include <linux/sunrpc/clnt.h>
-#include <linux/nfsd/nfsd.h>
 #include <linux/lockd/lockd.h>
 #include <linux/lockd/share.h>

fs/lockd/svcproc.c +0 -4

index e1d28dd..56c9519 100644
@@ -11,10 +11,6 @@
 #include <linux/time.h>
 #include <linux/slab.h>
 #include <linux/smp_lock.h>
-#include <linux/in.h>
-#include <linux/sunrpc/svc.h>
-#include <linux/sunrpc/clnt.h>
-#include <linux/nfsd/nfsd.h>
 #include <linux/lockd/lockd.h>
 #include <linux/lockd/share.h>

Signature · 1 line

1.6.5.2

David Miller

maintainer Applied

2009-11-25 23:19 UTC #6 lore raw

Re: [PATCH 2/5] sparc: remove unused nfsd #includes

In reply to Boaz Harrosh

From: Boaz Harrosh <[email protected]>
Date: Tue, 24 Nov 2009 20:01:00 +0200

Quoted 7 lines

Some unused includes removed.
In an effort to cleanup nfsd headers and move private definitions to source directory.
Signed-off-by Boaz Harrosh <[email protected]>

Applied to sparc-next-2.6, thank you.

Boaz Harrosh

author

2009-11-26 12:39 UTC #13 lore raw

Re: [PATCH 4/5] lockd: Remove unused nfsd headers #includes

In reply to J. Bruce Fields

Quoted 6 lines · J. Bruce Fields

Quoted 5 lines · J. Bruce Fields
Quoted 3 lines · Boaz Harrosh
In what history where these ever needed? Well not
any more.

Quoted 7 lines

Quoted 1 line
Applied, thanks.--b.
Um, I said that before I actually tried to compile it.... OK, dropping for now (assuming I'm missing some earlier patch).
--b.

OK, I didn't realize it but, yes I have these on top of the previous 6 so it makes sense.

I have posted the previous 6 rebased on your new current tree, have you seen it? All the patches are the same but [5/6] which has a "version 3". Do I need to re post?

Thanks
Boaz

Boaz Harrosh

author

2009-11-26 14:46 UTC #2 lore raw

Re: [PATCH 1/5] parsic: remove unused nfsd #includes

In reply to Boaz Harrosh

Quoted 9 lines · Grant Grundler

Quoted 2 lines · Boaz Harrosh
Some arch files had unneeded #includes directives from linux/nfsd/*. Some vfs files had unneeded #includes directives from linux/nfsd/*.
...
Quoted 4 lines
patches:
[PATCH 1/5] parsic: remove unused nfsd #includes
Some kind soul, please compile with this patch? compile is all that's needed.

Quoted 7 lines

Boaz,
linux-2.6 compiles for parisc with this patch. Please add:
Tested-by Grant Grundler <[email protected]>
thanks,
grant

CCing registered parsic maintainers. Could we please get an ACK on this patch, and cary this through the nfsd tree?

Thanks
Boaz

Quoted 29 lines · Boaz Harrosh

Some unused includes removed.

This patch is in an effort to cleanup nfsd headers and move private definitions to source directory.

Signed-off-by Boaz Harrosh <[email protected]>

---
 arch/parisc/kernel/sys_parisc32.c |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

arch/parisc/kernel/sys_parisc32.c +0 -6

index 561388b..4a8ca63 100644
@@ -26,13 +26,7 @@
 #include <linux/shm.h>
 #include <linux/slab.h>
 #include <linux/uio.h>
-#include <linux/nfs_fs.h>
 #include <linux/ncp_fs.h>
-#include <linux/sunrpc/svc.h>
-#include <linux/nfsd/nfsd.h>
-#include <linux/nfsd/cache.h>
-#include <linux/nfsd/xdr.h>
-#include <linux/nfsd/syscall.h>
 #include <linux/poll.h>
 #include <linux/personality.h>
 #include <linux/stat.h>

Helge Deller

maintainer Acked-by

2009-11-26 21:47 UTC #3 lore raw

Re: [PATCH 1/5] parsic: remove unused nfsd #includes

Quoted 14 lines · Boaz Harrosh

Quoted 13 lines · Grant Grundler
Quoted 2 lines · Boaz Harrosh
Some arch files had unneeded #includes directives from linux/nfsd/*. Some vfs files had unneeded #includes directives from linux/nfsd/*.
...
Quoted 4 lines
patches:
[PATCH 1/5] parsic: remove unused nfsd #includes
Some kind soul, please compile with this patch? compile is all that's needed.
Boaz,
linux-2.6 compiles for parisc with this patch. Please add:
Tested-by Grant Grundler<[email protected]>

Quoted 6 lines

Quoted 3 lines
thanks,
grant
CCing registered parsic maintainers. Could we please get an ACK on this patch, and cary this through the nfsd tree?

Sure.

Acked-by Helge Deller <[email protected]>

Helge

Quoted 40 lines

Thanks
Boaz
Quoted 19 lines · Boaz Harrosh
Some unused includes removed.
This patch is in an effort to cleanup nfsd headers and move private definitions to source directory.
Signed-off-by Boaz Harrosh<[email protected]>
---
  arch/parisc/kernel/sys_parisc32.c |    6 ------
  1 files changed, 0 insertions(+), 6 deletions(-)
arch/parisc/kernel/sys_parisc32.c +0 -0
index 561388b..4a8ca63 100644
@@ -26,13 +26,7 @@
  #include<linux/shm.h>
  #include<linux/slab.h>
  #include<linux/uio.h>
arch/parisc/kernel/sys_parisc32.c line 32
Quoted 10 lines
arch/parisc/kernel/sys_parisc32.c +0 -6
-#include<linux/nfs_fs.h>
  #include<linux/ncp_fs.h>
-#include<linux/sunrpc/svc.h>
-#include<linux/nfsd/nfsd.h>
-#include<linux/nfsd/cache.h>
-#include<linux/nfsd/xdr.h>
-#include<linux/nfsd/syscall.h>
  #include<linux/poll.h>
  #include<linux/personality.h>
  #include<linux/stat.h>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

J. Bruce Fields

2009-12-03 17:26 UTC #14 lore raw

Re: [PATCH 4/5] lockd: Remove unused nfsd headers #includes

In reply to Boaz Harrosh

Quoted 15 lines · Boaz Harrosh

Quoted 6 lines · J. Bruce Fields
Quoted 5 lines · J. Bruce Fields
Quoted 3 lines · Boaz Harrosh
In what history where these ever needed? Well not
any more.
Quoted 7 lines
Quoted 1 line
Applied, thanks.--b.
Um, I said that before I actually tried to compile it.... OK, dropping for now (assuming I'm missing some earlier patch).
--b.

Quoted 6 lines

OK, I didn't realize it but, yes I have these on top of the previous 6 so it makes sense.
I have posted the previous 6 rebased on your new current tree, have you seen it? All the patches are the same but [5/6] which has a "version 3". Do I need to re post?

Apologies, yes, would you mind reposting?

--b.