diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-08 02:59:00 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-08 02:59:00 +0000 |
| commit | 1fcb7623bc138d780101d7a70cfe29b11f7c67ef (patch) | |
| tree | e1ec9bb6aa19db16a405fb4393e2a90c38b4c75d /fs/nfsd | |
| parent | 458fe58677afb17219d864e100131728038b4f1b (diff) | |
Merge with Linux 2.4.0-test3-pre5. 64-bit kernel are still not
-Werror clean.
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/nfscache.c | 4 | ||||
| -rw-r--r-- | fs/nfsd/nfsctl.c | 2 | ||||
| -rw-r--r-- | fs/nfsd/nfsfh.c | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c index f5795583b..425778412 100644 --- a/fs/nfsd/nfscache.c +++ b/fs/nfsd/nfscache.c @@ -60,7 +60,7 @@ nfsd_cache_init(void) nfscache = (struct svc_cacherep *) __get_free_pages(GFP_KERNEL, order); if (!nfscache) { - printk (KERN_ERR "nfsd: cannot allocate %d bytes for reply cache\n", i); + printk (KERN_ERR "nfsd: cannot allocate %Zd bytes for reply cache\n", i); return; } memset(nfscache, 0, i); @@ -70,7 +70,7 @@ nfsd_cache_init(void) if (!hash_list) { free_pages ((unsigned long)nfscache, order); nfscache = NULL; - printk (KERN_ERR "nfsd: cannot allocate %d bytes for hash list\n", i); + printk (KERN_ERR "nfsd: cannot allocate %Zd bytes for hash list\n", i); return; } diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c index 913cbf5f8..d3bb67b53 100644 --- a/fs/nfsd/nfsctl.c +++ b/fs/nfsd/nfsctl.c @@ -312,7 +312,7 @@ done: EXPORT_NO_SYMBOLS; MODULE_AUTHOR("Olaf Kirch <okir@monad.swb.de>"); -extern int (*do_nfsservctl)(int, void *, void *); +extern long (*do_nfsservctl)(int, void *, void *); /* * Initialize the module diff --git a/fs/nfsd/nfsfh.c b/fs/nfsd/nfsfh.c index 511a14dc9..cc3896c38 100644 --- a/fs/nfsd/nfsfh.c +++ b/fs/nfsd/nfsfh.c @@ -8,7 +8,6 @@ * Extensive rewrite by Neil Brown <neilb@cse.unsw.edu.au> Southern-Spring 1999 */ -#include <linux/config.h> #include <linux/sched.h> #include <linux/malloc.h> #include <linux/fs.h> |