From: "J. Bruce Fields" Subject: Re: [RFC] nfsd: Move private headers to source directory Date: Wed, 25 Nov 2009 15:14:08 -0500 Message-ID: <20091125201408.GI32502@fieldses.org> References: <4B0C1EB7.50508@panasas.com> <4B0C205A.3000403@panasas.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Linux Kernel , linux-parisc , sparclinux , linux-s390 , NFS list , pNFS Mailing List , Andrew Morton To: Boaz Harrosh Return-path: Received: from fieldses.org ([174.143.236.118]:39065 "EHLO fieldses.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934917AbZKYUNT (ORCPT ); Wed, 25 Nov 2009 15:13:19 -0500 In-Reply-To: <4B0C205A.3000403@panasas.com> Sender: linux-nfs-owner@vger.kernel.org List-ID: On Tue, Nov 24, 2009 at 08:05:14PM +0200, Boaz Harrosh wrote: > > 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. > > Signed-off-by: Boaz Harrosh > --- > 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%) > > diff --git a/fs/nfsd/auth.c b/fs/nfsd/auth.c > index ad354d2..71209d4 100644 > --- a/fs/nfsd/auth.c > +++ b/fs/nfsd/auth.c > @@ -5,7 +5,7 @@ > */ > > #include > -#include > +#include "nfsd.h" > #include "auth.h" > > int nfsexp_flags(struct svc_rqst *rqstp, struct svc_export *exp) > diff --git a/include/linux/nfsd/cache.h b/fs/nfsd/cache.h > similarity index 100% > rename from include/linux/nfsd/cache.h > rename to fs/nfsd/cache.h > diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c > index 68e63f4..cb3dae2 100644 > --- a/fs/nfsd/export.c > +++ b/fs/nfsd/export.c > @@ -18,10 +18,11 @@ > #include > #include > > -#include > #include > #include > > +#include "nfsd.h" > + > #define NFSDDBG_FACILITY NFSDDBG_EXPORT > > typedef struct auth_domain svc_client; > diff --git a/fs/nfsd/lockd.c b/fs/nfsd/lockd.c > index 801ef71..6f12777 100644 > --- a/fs/nfsd/lockd.c > +++ b/fs/nfsd/lockd.c > @@ -9,8 +9,8 @@ > */ > > #include > -#include > #include > +#include "nfsd.h" > #include "vfs.h" > > #define NFSDDBG_FACILITY NFSDDBG_LOCKD > diff --git a/fs/nfsd/nfs2acl.c b/fs/nfsd/nfs2acl.c > index a54628d..874e2a9 100644 > --- a/fs/nfsd/nfs2acl.c > +++ b/fs/nfsd/nfs2acl.c > @@ -6,10 +6,11 @@ > * Copyright (C) 2002-2003 Andreas Gruenbacher > */ > > -#include > -#include > -#include > +#include "nfsd.h" > +/* FIXME: nfsacl.h is a broken header */ > #include > +#include "cache.h" > +#include "xdr3.h" > #include "vfs.h" > > #define NFSDDBG_FACILITY NFSDDBG_PROC > diff --git a/fs/nfsd/nfs3acl.c b/fs/nfsd/nfs3acl.c > index 2f5c61b..c6011dd 100644 > --- a/fs/nfsd/nfs3acl.c > +++ b/fs/nfsd/nfs3acl.c > @@ -6,10 +6,11 @@ > * Copyright (C) 2002-2003 Andreas Gruenbacher > */ > > -#include > -#include > -#include > +#include "nfsd.h" > +/* FIXME: nfsacl.h is a broken header */ > #include > +#include "cache.h" > +#include "xdr3.h" > #include "vfs.h" > > #define RETURN_STATUS(st) { resp->status = (st); return (st); } > diff --git a/fs/nfsd/nfs3proc.c b/fs/nfsd/nfs3proc.c > index b694b43..90b19ca 100644 > --- a/fs/nfsd/nfs3proc.c > +++ b/fs/nfsd/nfs3proc.c > @@ -10,8 +10,8 @@ > #include > #include > > -#include > -#include > +#include "cache.h" > +#include "xdr3.h" > #include "vfs.h" > > #define NFSDDBG_FACILITY NFSDDBG_PROC > diff --git a/fs/nfsd/nfs3xdr.c b/fs/nfsd/nfs3xdr.c > index 623e13a..c523bb8 100644 > --- a/fs/nfsd/nfs3xdr.c > +++ b/fs/nfsd/nfs3xdr.c > @@ -9,7 +9,7 @@ > */ > > #include > -#include > +#include "xdr3.h" > #include "auth.h" > > #define NFSDDBG_FACILITY NFSDDBG_XDR > diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c > index 4fe3960..f7a3158 100644 > --- a/fs/nfsd/nfs4callback.c > +++ b/fs/nfsd/nfs4callback.c > @@ -34,8 +34,8 @@ > */ > > #include > -#include > -#include > +#include "nfsd.h" > +#include "state.h" > > #define NFSDDBG_FACILITY NFSDDBG_PROC > > diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c > index d0e04cb..f8a37c4 100644 > --- a/fs/nfsd/nfs4proc.c > +++ b/fs/nfsd/nfs4proc.c > @@ -36,8 +36,8 @@ > */ > #include > > -#include > -#include > +#include "cache.h" > +#include "xdr4.h" > #include "vfs.h" > > #define NFSDDBG_FACILITY NFSDDBG_PROC > diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c > index 48742f2..6744e7f 100644 > --- a/fs/nfsd/nfs4recover.c > +++ b/fs/nfsd/nfs4recover.c > @@ -33,12 +33,13 @@ > * > */ > > -#include > -#include > #include > #include > #include > #include > + > +#include "nfsd.h" > +#include "state.h" > #include "vfs.h" > > #define NFSDDBG_FACILITY NFSDDBG_PROC > diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c > index 1fe6e29..2923e6c 100644 > --- a/fs/nfsd/nfs4state.c > +++ b/fs/nfsd/nfs4state.c > @@ -36,11 +36,11 @@ > > #include > #include > -#include > #include > #include > #include > #include > +#include "xdr4.h" > #include "vfs.h" > > #define NFSDDBG_FACILITY NFSDDBG_PROC > diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c > index 2fa9682..cab9780 100644 > --- a/fs/nfsd/nfs4xdr.c > +++ b/fs/nfsd/nfs4xdr.c > @@ -43,10 +43,11 @@ > #include > #include > #include > -#include > #include > #include > #include > + > +#include "xdr4.h" > #include "vfs.h" > > #define NFSDDBG_FACILITY NFSDDBG_XDR > diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c > index 96694b8..18aa972 100644 > --- a/fs/nfsd/nfscache.c > +++ b/fs/nfsd/nfscache.c > @@ -10,8 +10,8 @@ > * Copyright (C) 1995, 1996 Olaf Kirch > */ > > -#include > -#include > +#include "nfsd.h" > +#include "cache.h" > > /* Size of reply cache. Common values are: > * 4.3BSD: 128 > diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c > index e4f49fd..0415680 100644 > --- a/fs/nfsd/nfsctl.c > +++ b/fs/nfsd/nfsctl.c > @@ -11,12 +11,13 @@ > > #include > #include > -#include > -#include > #include > #include > #include > > +#include "nfsd.h" > +#include "cache.h" > + > /* > * We have a single directory with 9 nodes in it. > */ > diff --git a/include/linux/nfsd/nfsd.h b/fs/nfsd/nfsd.h > similarity index 100% > rename from include/linux/nfsd/nfsd.h > rename to fs/nfsd/nfsd.h > diff --git a/fs/nfsd/nfsfh.c b/fs/nfsd/nfsfh.c > index 4ef4601..2bf9efb 100644 > --- a/fs/nfsd/nfsfh.c > +++ b/fs/nfsd/nfsfh.c > @@ -12,7 +12,7 @@ > #include > > #include > -#include > +#include "nfsd.h" > #include "vfs.h" > #include "auth.h" > > diff --git a/fs/nfsd/nfsproc.c b/fs/nfsd/nfsproc.c > index b6bd9e0..21a5f79 100644 > --- a/fs/nfsd/nfsproc.c > +++ b/fs/nfsd/nfsproc.c > @@ -9,8 +9,8 @@ > > #include > > -#include > -#include > +#include "cache.h" > +#include "xdr.h" > #include "vfs.h" > > typedef struct svc_rqst svc_rqst; > diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c > index b2d7ffa..b520ce1 100644 > --- a/fs/nfsd/nfssvc.c > +++ b/fs/nfsd/nfssvc.c > @@ -15,11 +15,11 @@ > > #include > #include > -#include > -#include > #include > #include > #include > +#include "nfsd.h" > +#include "cache.h" > #include "vfs.h" > > #define NFSDDBG_FACILITY NFSDDBG_SVC > diff --git a/fs/nfsd/nfsxdr.c b/fs/nfsd/nfsxdr.c > index 5e0603d..3bec831 100644 > --- a/fs/nfsd/nfsxdr.c > +++ b/fs/nfsd/nfsxdr.c > @@ -6,7 +6,7 @@ > * Copyright (C) 1995, 1996 Olaf Kirch > */ > > -#include > +#include "xdr.h" > #include "auth.h" > > #define NFSDDBG_FACILITY NFSDDBG_XDR > diff --git a/include/linux/nfsd/state.h b/fs/nfsd/state.h > similarity index 100% > rename from include/linux/nfsd/state.h > rename to fs/nfsd/state.h > diff --git a/fs/nfsd/stats.c b/fs/nfsd/stats.c > index e3e411e..3fc69df 100644 > --- a/fs/nfsd/stats.c > +++ b/fs/nfsd/stats.c > @@ -25,11 +25,11 @@ > > #include > #include > - > #include > -#include > #include > > +#include "nfsd.h" > + > struct nfsd_stats nfsdstats; > struct svc_stat nfsd_svcstats = { > .program = &nfsd_program, > diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c > index 81ce108..04bdba1 100644 > --- a/fs/nfsd/vfs.c > +++ b/fs/nfsd/vfs.c > @@ -22,23 +22,25 @@ > #include > #include > #include > -#include > -#ifdef CONFIG_NFSD_V3 > -#include > -#endif /* CONFIG_NFSD_V3 */ > #include > #include > #include > #include > +#include > +#include > +#include > + > +#ifdef CONFIG_NFSD_V3 > +#include "xdr3.h" > +#endif /* CONFIG_NFSD_V3 */ > + > #ifdef CONFIG_NFSD_V4 > #include > #include > #endif /* CONFIG_NFSD_V4 */ > -#include > -#include > -#include "vfs.h" > > -#include > +#include "nfsd.h" > +#include "vfs.h" > > #define NFSDDBG_FACILITY NFSDDBG_FILEOP > > diff --git a/include/linux/nfsd/xdr.h b/fs/nfsd/xdr.h > similarity index 99% > rename from include/linux/nfsd/xdr.h > rename to fs/nfsd/xdr.h > index 58f824d..235ee5c 100644 > --- a/include/linux/nfsd/xdr.h > +++ b/fs/nfsd/xdr.h > @@ -8,7 +8,7 @@ > #define LINUX_NFSD_H > > #include > -#include > +#include "nfsd.h" > > struct nfsd_fhandle { > struct svc_fh fh; > diff --git a/include/linux/nfsd/xdr3.h b/fs/nfsd/xdr3.h > similarity index 99% > rename from include/linux/nfsd/xdr3.h > rename to fs/nfsd/xdr3.h > index 421eddd..b330756 100644 > --- a/include/linux/nfsd/xdr3.h > +++ b/fs/nfsd/xdr3.h > @@ -9,7 +9,7 @@ > #ifndef _LINUX_NFSD_XDR3_H > #define _LINUX_NFSD_XDR3_H > > -#include > +#include "xdr.h" > > struct nfsd3_sattrargs { > struct svc_fh fh; > diff --git a/include/linux/nfsd/xdr4.h b/fs/nfsd/xdr4.h > similarity index 99% > rename from include/linux/nfsd/xdr4.h > rename to fs/nfsd/xdr4.h > index 1bf2662..83202a1 100644 > --- a/include/linux/nfsd/xdr4.h > +++ b/fs/nfsd/xdr4.h > @@ -39,8 +39,8 @@ > #ifndef _LINUX_NFSD_XDR4_H > #define _LINUX_NFSD_XDR4_H > > -#include > -#include > +#include "state.h" > +#include "nfsd.h" > > #define NFSD4_MAX_TAGLEN 128 > #define XDR_LEN(n) (((n) + 3) & ~3) > -- > 1.6.5.2 > >