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
/
sysv
/
super.c
diff --git
a/fs/sysv/super.c
b/fs/sysv/super.c
index
e92b991
..
876639b
100644
(file)
--- a/
fs/sysv/super.c
+++ b/
fs/sysv/super.c
@@
-506,16
+506,17
@@
failed:
/* Every kernel module contains stuff like this. */
/* Every kernel module contains stuff like this. */
-static
struct super_block *
sysv_get_sb(struct file_system_type *fs_type,
- int flags, const char *dev_name, void *data)
+static
int
sysv_get_sb(struct file_system_type *fs_type,
+ int flags, const char *dev_name, void *data
, struct vfsmount *mnt
)
{
{
- return get_sb_bdev(fs_type, flags, dev_name, data, sysv_fill_super);
+ return get_sb_bdev(fs_type, flags, dev_name, data, sysv_fill_super,
+ mnt);
}
}
-static
struct super_block *
v7_get_sb(struct file_system_type *fs_type,
- int flags, const char *dev_name, void *data)
+static
int
v7_get_sb(struct file_system_type *fs_type,
+ int flags, const char *dev_name, void *data
, struct vfsmount *mnt
)
{
{
- return get_sb_bdev(fs_type, flags, dev_name, data, v7_fill_super);
+ return get_sb_bdev(fs_type, flags, dev_name, data, v7_fill_super
, mnt
);
}
static struct file_system_type sysv_fs_type = {
}
static struct file_system_type sysv_fs_type = {