Re: 2.5.5 -- filesystems.c:30: In function `sys_nfsservctl':

[Neil Brown]

On  February 20, [e-mail] wrote:
> On Wed, 2002-02-20 at 15:27, Neil Brown wrote:
> 
> > Opps, my mistake.
> > 
> > Please try this.
> 
> This does not apply to my include/linux/nfsd/interface.h ?
> 
> In 2.5.5, that file is 24 lines long.  The first hunk applies, but the
> second, at line 155, obviously does not.

Post in haste ... repent at leisure....

I made that patch against my current, heavily patches tree as I though
that the changes to interface.h wouldn't conflict... I was wrong.

The correct patch, which applies against 2.5.5 and compiles with out
errors for several combinationg of CONFIG_MODULES enabled or not, and
CONFIG_NFSD being Y, M, or N, is below.

NeilBrown

 ----------- Diffstat output ------------
 ./include/linux/nfsd/interface.h |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

--- ./include/linux/nfsd/interface.h	2002/02/20 21:58:11	1.1
+++ ./include/linux/nfsd/interface.h	2002/02/20 23:35:19	1.2
@@ -12,13 +12,15 @@
 
 #include <linux/config.h>
 
-#ifdef CONFIG_NFSD_MODULE
+#ifndef CONFIG_NFSD
+#ifdef CONFIG_MODULES
 
 extern struct nfsd_linkage {
 	long (*do_nfsservctl)(int cmd, void *argp, void *resp);
 	struct module *owner;
 } * nfsd_linkage;
 
+#endif
 #endif
 
 #endif /* LINUX_NFSD_INTERFACE_H */

> 
> 	Robert Love