|
@@ -73,8 +73,8 @@ static int ext4_statfs(struct dentry *dentry, struct kstatfs *buf);
|
|
|
static int ext4_unfreeze(struct super_block *sb);
|
|
|
static void ext4_write_super(struct super_block *sb);
|
|
|
static int ext4_freeze(struct super_block *sb);
|
|
|
-static int ext4_get_sb(struct file_system_type *fs_type, int flags,
|
|
|
- const char *dev_name, void *data, struct vfsmount *mnt);
|
|
|
+static struct dentry *ext4_mount(struct file_system_type *fs_type, int flags,
|
|
|
+ const char *dev_name, void *data);
|
|
|
static void ext4_destroy_lazyinit_thread(void);
|
|
|
static void ext4_unregister_li_request(struct super_block *sb);
|
|
|
|
|
@@ -82,7 +82,7 @@ static void ext4_unregister_li_request(struct super_block *sb);
|
|
|
static struct file_system_type ext3_fs_type = {
|
|
|
.owner = THIS_MODULE,
|
|
|
.name = "ext3",
|
|
|
- .get_sb = ext4_get_sb,
|
|
|
+ .mount = ext4_mount,
|
|
|
.kill_sb = kill_block_super,
|
|
|
.fs_flags = FS_REQUIRES_DEV,
|
|
|
};
|
|
@@ -4667,17 +4667,17 @@ out:
|
|
|
|
|
|
#endif
|
|
|
|
|
|
-static int ext4_get_sb(struct file_system_type *fs_type, int flags,
|
|
|
- const char *dev_name, void *data, struct vfsmount *mnt)
|
|
|
+static struct dentry *ext4_mount(struct file_system_type *fs_type, int flags,
|
|
|
+ const char *dev_name, void *data)
|
|
|
{
|
|
|
- return get_sb_bdev(fs_type, flags, dev_name, data, ext4_fill_super,mnt);
|
|
|
+ return mount_bdev(fs_type, flags, dev_name, data, ext4_fill_super);
|
|
|
}
|
|
|
|
|
|
#if !defined(CONFIG_EXT2_FS) && !defined(CONFIG_EXT2_FS_MODULE) && defined(CONFIG_EXT4_USE_FOR_EXT23)
|
|
|
static struct file_system_type ext2_fs_type = {
|
|
|
.owner = THIS_MODULE,
|
|
|
.name = "ext2",
|
|
|
- .get_sb = ext4_get_sb,
|
|
|
+ .mount = ext4_mount,
|
|
|
.kill_sb = kill_block_super,
|
|
|
.fs_flags = FS_REQUIRES_DEV,
|
|
|
};
|
|
@@ -4722,7 +4722,7 @@ static inline void unregister_as_ext3(void) { }
|
|
|
static struct file_system_type ext4_fs_type = {
|
|
|
.owner = THIS_MODULE,
|
|
|
.name = "ext4",
|
|
|
- .get_sb = ext4_get_sb,
|
|
|
+ .mount = ext4_mount,
|
|
|
.kill_sb = kill_block_super,
|
|
|
.fs_flags = FS_REQUIRES_DEV,
|
|
|
};
|