* Re: [PATCHSET 0-5] remove unneeded nfsd #includes [not found] <4B0C1EB7.50508@panasas.com> @ 2009-11-24 21:27 ` Grant Grundler 2009-11-24 23:08 ` J. Bruce Fields ` (6 subsequent siblings) 7 siblings, 0 replies; 13+ messages in thread From: Grant Grundler @ 2009-11-24 21:27 UTC (permalink / raw) To: Boaz Harrosh Cc: J. Bruce Fields, Linux Kernel, linux-parisc, sparclinux, linux-s390, NFS list, pNFS Mailing List, Andrew Morton On Tue, Nov 24, 2009 at 07:58:15PM +0200, Boaz Harrosh wrote: > Some arch files had unneeded #includes directives from linux/nfsd/*. > Some vfs files had unneeded #includes directives from linux/nfsd/*. ... > 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 <grundler-6jwH94ZQLHl74goWV3ctuw@public.gmane.org> thanks, grant > > [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 majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCHSET 0-5] remove unneeded nfsd #includes [not found] <4B0C1EB7.50508@panasas.com> 2009-11-24 21:27 ` [PATCHSET 0-5] remove unneeded nfsd #includes Grant Grundler @ 2009-11-24 23:08 ` J. Bruce Fields 2009-11-25 8:42 ` Boaz Harrosh [not found] ` <4B0C1F98.4000204@panasas.com> ` (5 subsequent siblings) 7 siblings, 1 reply; 13+ messages in thread From: J. Bruce Fields @ 2009-11-24 23:08 UTC (permalink / raw) To: Boaz Harrosh Cc: Linux Kernel, linux-parisc, sparclinux, linux-s390, NFS list, pNFS Mailing List, Andrew Morton On Tue, Nov 24, 2009 at 07:58:15PM +0200, Boaz Harrosh wrote: > 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. ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCHSET 0-5] remove unneeded nfsd #includes 2009-11-24 23:08 ` J. Bruce Fields @ 2009-11-25 8:42 ` Boaz Harrosh 0 siblings, 0 replies; 13+ messages in thread From: Boaz Harrosh @ 2009-11-25 8:42 UTC (permalink / raw) To: J. Bruce Fields Cc: Linux Kernel, linux-parisc, sparclinux, linux-s390, NFS list, pNFS Mailing List, Andrew Morton On 11/25/2009 01:08 AM, J. Bruce Fields wrote: > On Tue, Nov 24, 2009 at 07:58:15PM +0200, Boaz Harrosh wrote: >> 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 > --b. ^ permalink raw reply [flat|nested] 13+ messages in thread
[parent not found: <4B0C1F98.4000204@panasas.com>]
* Re: [PATCH 3/5] s390: remove unused nfsd #includes [not found] ` <4B0C1F98.4000204@panasas.com> @ 2009-11-25 8:38 ` Martin Schwidefsky 0 siblings, 0 replies; 13+ messages in thread From: Martin Schwidefsky @ 2009-11-25 8:38 UTC (permalink / raw) To: Boaz Harrosh Cc: J. Bruce Fields, Linux Kernel, linux-parisc, sparclinux, linux-s390, NFS list, pNFS Mailing List, Andrew Morton On Tue, 24 Nov 2009 20:02:00 +0200 Boaz Harrosh <bharrosh@panasas.com> 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 <bharrosh@panasas.com> > --- > 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. -- blue skies, Martin. "Reality continues to ruin my life." - Calvin. ^ permalink raw reply [flat|nested] 13+ messages in thread
[parent not found: <4B0C1FE0.8040105@panasas.com>]
* Re: [PATCH 4/5] lockd: Remove unused nfsd headers #includes [not found] ` <4B0C1FE0.8040105@panasas.com> @ 2009-11-25 20:10 ` J. Bruce Fields 2009-11-25 20:23 ` J. Bruce Fields 0 siblings, 1 reply; 13+ messages in thread From: J. Bruce Fields @ 2009-11-25 20:10 UTC (permalink / raw) To: Boaz Harrosh Cc: Linux Kernel, linux-parisc, sparclinux, linux-s390, NFS list, pNFS Mailing List, Andrew Morton On Tue, Nov 24, 2009 at 08:03:12PM +0200, Boaz Harrosh wrote: > > In what history where these ever needed? Well not > any more. Applied, thanks.--b. > > Signed-off-by: Boaz Harrosh <bharrosh@panasas.com> > --- > fs/lockd/svc4proc.c | 4 ---- > fs/lockd/svcproc.c | 4 ---- > 2 files changed, 0 insertions(+), 8 deletions(-) > > diff --git a/fs/lockd/svc4proc.c b/fs/lockd/svc4proc.c > index bd173a6..a7966ee 100644 > --- a/fs/lockd/svc4proc.c > +++ b/fs/lockd/svc4proc.c > @@ -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> > > diff --git a/fs/lockd/svcproc.c b/fs/lockd/svcproc.c > index e1d28dd..56c9519 100644 > --- a/fs/lockd/svcproc.c > +++ b/fs/lockd/svcproc.c > @@ -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> > > -- > 1.6.5.2 > > ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 4/5] lockd: Remove unused nfsd headers #includes 2009-11-25 20:10 ` [PATCH 4/5] lockd: Remove unused nfsd headers #includes J. Bruce Fields @ 2009-11-25 20:23 ` J. Bruce Fields 2009-11-26 12:39 ` Boaz Harrosh 0 siblings, 1 reply; 13+ messages in thread From: J. Bruce Fields @ 2009-11-25 20:23 UTC (permalink / raw) To: Boaz Harrosh Cc: Linux Kernel, linux-parisc, sparclinux, linux-s390, NFS list, pNFS Mailing List, Andrew Morton On Wed, Nov 25, 2009 at 03:10:11PM -0500, J. Bruce Fields wrote: > On Tue, Nov 24, 2009 at 08:03:12PM +0200, Boaz Harrosh wrote: > > > > 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. > > > > > Signed-off-by: Boaz Harrosh <bharrosh@panasas.com> > > --- > > fs/lockd/svc4proc.c | 4 ---- > > fs/lockd/svcproc.c | 4 ---- > > 2 files changed, 0 insertions(+), 8 deletions(-) > > > > diff --git a/fs/lockd/svc4proc.c b/fs/lockd/svc4proc.c > > index bd173a6..a7966ee 100644 > > --- a/fs/lockd/svc4proc.c > > +++ b/fs/lockd/svc4proc.c > > @@ -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> > > > > diff --git a/fs/lockd/svcproc.c b/fs/lockd/svcproc.c > > index e1d28dd..56c9519 100644 > > --- a/fs/lockd/svcproc.c > > +++ b/fs/lockd/svcproc.c > > @@ -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> > > > > -- > > 1.6.5.2 > > > > ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 4/5] lockd: Remove unused nfsd headers #includes 2009-11-25 20:23 ` J. Bruce Fields @ 2009-11-26 12:39 ` Boaz Harrosh 2009-12-03 17:27 ` J. Bruce Fields 0 siblings, 1 reply; 13+ messages in thread From: Boaz Harrosh @ 2009-11-26 12:39 UTC (permalink / raw) To: J. Bruce Fields Cc: Linux Kernel, linux-parisc, sparclinux, linux-s390, NFS list, pNFS Mailing List, Andrew Morton On 11/25/2009 10:23 PM, J. Bruce Fields wrote: > On Wed, Nov 25, 2009 at 03:10:11PM -0500, J. Bruce Fields wrote: >> On Tue, Nov 24, 2009 at 08:03:12PM +0200, Boaz Harrosh wrote: >>> >>> 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. > 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 ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 4/5] lockd: Remove unused nfsd headers #includes 2009-11-26 12:39 ` Boaz Harrosh @ 2009-12-03 17:27 ` J. Bruce Fields 0 siblings, 0 replies; 13+ messages in thread From: J. Bruce Fields @ 2009-12-03 17:27 UTC (permalink / raw) To: Boaz Harrosh Cc: Linux Kernel, linux-parisc, sparclinux, linux-s390, NFS list, pNFS Mailing List, Andrew Morton On Thu, Nov 26, 2009 at 02:39:17PM +0200, Boaz Harrosh wrote: > On 11/25/2009 10:23 PM, J. Bruce Fields wrote: > > On Wed, Nov 25, 2009 at 03:10:11PM -0500, J. Bruce Fields wrote: > >> On Tue, Nov 24, 2009 at 08:03:12PM +0200, Boaz Harrosh wrote: > >>> > >>> 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. > > > > 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. ^ permalink raw reply [flat|nested] 13+ messages in thread
[parent not found: <4B0C201C.4040400@panasas.com>]
* Re: [PATCH 5/5] vfs: nfsctl.c unused nfsd #includes [not found] ` <4B0C201C.4040400@panasas.com> @ 2009-11-25 20:13 ` J. Bruce Fields 0 siblings, 0 replies; 13+ messages in thread From: J. Bruce Fields @ 2009-11-25 20:13 UTC (permalink / raw) To: Boaz Harrosh Cc: Linux Kernel, linux-parisc, sparclinux, linux-s390, NFS list, pNFS Mailing List, Andrew Morton On Tue, Nov 24, 2009 at 08:04:12PM +0200, Boaz Harrosh wrote: > > 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. > > Signed-off-by: Boaz Harrosh <bharrosh@panasas.com> > --- > fs/nfsctl.c | 2 -- > 1 files changed, 0 insertions(+), 2 deletions(-) > > diff --git a/fs/nfsctl.c b/fs/nfsctl.c > index 8f9a205..d3854d9 100644 > --- a/fs/nfsctl.c > +++ b/fs/nfsctl.c > @@ -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> > -- > 1.6.5.2 > > ^ permalink raw reply [flat|nested] 13+ messages in thread
[parent not found: <4B0C205A.3000403@panasas.com>]
* Re: [RFC] nfsd: Move private headers to source directory [not found] ` <4B0C205A.3000403@panasas.com> @ 2009-11-25 20:14 ` J. Bruce Fields 0 siblings, 0 replies; 13+ messages in thread From: J. Bruce Fields @ 2009-11-25 20:14 UTC (permalink / raw) To: Boaz Harrosh Cc: Linux Kernel, linux-parisc, sparclinux, linux-s390, NFS list, pNFS Mailing List, Andrew Morton 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 <bharrosh@panasas.com> > --- > 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 <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) > 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 <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; > 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 <linux/file.h> > -#include <linux/nfsd/nfsd.h> > #include <linux/lockd/bind.h> > +#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 <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 > 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 <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); } > 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 <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 > 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 <linux/namei.h> > -#include <linux/nfsd/xdr3.h> > +#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 <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 > > 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 <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 > 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 <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 > 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 <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 > 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 <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 > 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 <okir-pn4DOG8n3UYbFoVRYvo4fw@public.gmane.org> > */ > > -#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 > 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 <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. > */ > 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 <linux/exportfs.h> > > #include <linux/sunrpc/svcauth_gss.h> > -#include <linux/nfsd/nfsd.h> > +#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 <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; > 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 <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 > 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 <okir-pn4DOG8n3UYbFoVRYvo4fw@public.gmane.org> > */ > > -#include <linux/nfsd/xdr.h> > +#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 <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, > 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 <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 > > 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 <linux/vfs.h> > -#include <linux/nfsd/nfsd.h> > +#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 <linux/nfsd/xdr.h> > +#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 <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) > -- > 1.6.5.2 > > ^ permalink raw reply [flat|nested] 13+ messages in thread
[parent not found: <4B0C1F5C.9090903@panasas.com>]
* Re: [PATCH 2/5] sparc: remove unused nfsd #includes [not found] ` <4B0C1F5C.9090903@panasas.com> @ 2009-11-25 23:19 ` David Miller 0 siblings, 0 replies; 13+ messages in thread From: David Miller @ 2009-11-25 23:19 UTC (permalink / raw) To: bharrosh Cc: bfields, linux-kernel, linux-parisc, sparclinux, linux-s390, linux-nfs, pnfs, akpm From: Boaz Harrosh <bharrosh@panasas.com> Date: Tue, 24 Nov 2009 20:01:00 +0200 > > Some unused includes removed. > > In an effort to cleanup nfsd headers and move private > definitions to source directory. > > Signed-off-by: Boaz Harrosh <bharrosh@panasas.com> Applied to sparc-next-2.6, thank you. ^ permalink raw reply [flat|nested] 13+ messages in thread
[parent not found: <4B0C1F1A.8070605@panasas.com>]
* Re: [PATCH 1/5] parsic: remove unused nfsd #includes [not found] ` <4B0C1F1A.8070605@panasas.com> @ 2009-11-26 14:46 ` Boaz Harrosh 2009-11-26 21:47 ` Helge Deller 0 siblings, 1 reply; 13+ messages in thread From: Boaz Harrosh @ 2009-11-26 14:46 UTC (permalink / raw) To: J. Bruce Fields, linux-parisc, Grant Grundler, Kyle McMartin, Helge Deller <de> Cc: Linux Kernel, sparclinux, linux-s390, NFS list, pNFS Mailing List, Andrew Morton On 11/24/2009 11:27 PM, Grant Grundler wrote: > On Tue, Nov 24, 2009 at 07:58:15PM +0200, Boaz Harrosh wrote: >> Some arch files had unneeded #includes directives from linux/nfsd/*. >> Some vfs files had unneeded #includes directives from linux/nfsd/*. > ... >> 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 <grundler@parisc-linux.org> > > thanks, > grant > CCing registered parsic maintainers. Could we please get an ACK on this patch, and cary this through the nfsd tree? Thanks Boaz On 11/24/2009 07:59 PM, Boaz Harrosh 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 <bharrosh@panasas.com> > --- > arch/parisc/kernel/sys_parisc32.c | 6 ------ > 1 files changed, 0 insertions(+), 6 deletions(-) > > diff --git a/arch/parisc/kernel/sys_parisc32.c b/arch/parisc/kernel/sys_parisc32.c > index 561388b..4a8ca63 100644 > --- a/arch/parisc/kernel/sys_parisc32.c > +++ b/arch/parisc/kernel/sys_parisc32.c > @@ -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> ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 1/5] parsic: remove unused nfsd #includes 2009-11-26 14:46 ` [PATCH 1/5] parsic: " Boaz Harrosh @ 2009-11-26 21:47 ` Helge Deller 0 siblings, 0 replies; 13+ messages in thread From: Helge Deller @ 2009-11-26 21:47 UTC (permalink / raw) To: Boaz Harrosh Cc: J. Bruce Fields, linux-parisc, Grant Grundler, Kyle McMartin, James E.J. Bottomley, Linux Kernel, sparclinux, linux-s390, NFS list, pNFS Mailing List, Andrew Morton On 11/26/2009 03:46 PM, Boaz Harrosh wrote: > On 11/24/2009 11:27 PM, Grant Grundler wrote: >> On Tue, Nov 24, 2009 at 07:58:15PM +0200, Boaz Harrosh wrote: >>> Some arch files had unneeded #includes directives from linux/nfsd/*. >>> Some vfs files had unneeded #includes directives from linux/nfsd/*. >> ... >>> 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<grundler@parisc-linux.org> >> >> 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 <deller@gmx.de> Helge > > Thanks > Boaz > > On 11/24/2009 07:59 PM, Boaz Harrosh 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<bharrosh@panasas.com> >> --- >> arch/parisc/kernel/sys_parisc32.c | 6 ------ >> 1 files changed, 0 insertions(+), 6 deletions(-) >> >> diff --git a/arch/parisc/kernel/sys_parisc32.c b/arch/parisc/kernel/sys_parisc32.c >> index 561388b..4a8ca63 100644 >> --- a/arch/parisc/kernel/sys_parisc32.c >> +++ b/arch/parisc/kernel/sys_parisc32.c >> @@ -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> > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ ^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2009-12-03 17:27 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <4B0C1EB7.50508@panasas.com>
2009-11-24 21:27 ` [PATCHSET 0-5] remove unneeded nfsd #includes Grant Grundler
2009-11-24 23:08 ` J. Bruce Fields
2009-11-25 8:42 ` Boaz Harrosh
[not found] ` <4B0C1F98.4000204@panasas.com>
2009-11-25 8:38 ` [PATCH 3/5] s390: remove unused " Martin Schwidefsky
[not found] ` <4B0C1FE0.8040105@panasas.com>
2009-11-25 20:10 ` [PATCH 4/5] lockd: Remove unused nfsd headers #includes J. Bruce Fields
2009-11-25 20:23 ` J. Bruce Fields
2009-11-26 12:39 ` Boaz Harrosh
2009-12-03 17:27 ` J. Bruce Fields
[not found] ` <4B0C201C.4040400@panasas.com>
2009-11-25 20:13 ` [PATCH 5/5] vfs: nfsctl.c unused nfsd #includes J. Bruce Fields
[not found] ` <4B0C205A.3000403@panasas.com>
2009-11-25 20:14 ` [RFC] nfsd: Move private headers to source directory J. Bruce Fields
[not found] ` <4B0C1F5C.9090903@panasas.com>
2009-11-25 23:19 ` [PATCH 2/5] sparc: remove unused nfsd #includes David Miller
[not found] ` <4B0C1F1A.8070605@panasas.com>
2009-11-26 14:46 ` [PATCH 1/5] parsic: " Boaz Harrosh
2009-11-26 21:47 ` Helge Deller
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).