git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
fs
/
nfsd
/
nfsctl.c
diff --git
a/fs/nfsd/nfsctl.c
b/fs/nfsd/nfsctl.c
index
8fd615f
..
42165e5
100644
(file)
--- a/
fs/nfsd/nfsctl.c
+++ b/
fs/nfsd/nfsctl.c
@@
-6,7
+6,6
@@
* Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de>
*/
* Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de>
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/linkage.h>
#include <linux/module.h>
#include <linux/linkage.h>
@@
-553,10
+552,10
@@
static int nfsd_fill_super(struct super_block * sb, void * data, int silent)
return simple_fill_super(sb, 0x6e667364, nfsd_files);
}
return simple_fill_super(sb, 0x6e667364, nfsd_files);
}
-static
struct super_block *
nfsd_get_sb(struct file_system_type *fs_type,
- int flags, const char *dev_name, void *data)
+static
int
nfsd_get_sb(struct file_system_type *fs_type,
+ int flags, const char *dev_name, void *data
, struct vfsmount *mnt
)
{
{
- return get_sb_single(fs_type, flags, data, nfsd_fill_super);
+ return get_sb_single(fs_type, flags, data, nfsd_fill_super
, mnt
);
}
static struct file_system_type nfsd_fs_type = {
}
static struct file_system_type nfsd_fs_type = {