aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext4/super.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ext4/super.c')
-rw-r--r--fs/ext4/super.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 0348ce066592..40131b777af6 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -73,8 +73,8 @@ static int ext4_statfs(struct dentry *dentry, struct kstatfs *buf);
73static int ext4_unfreeze(struct super_block *sb); 73static int ext4_unfreeze(struct super_block *sb);
74static void ext4_write_super(struct super_block *sb); 74static void ext4_write_super(struct super_block *sb);
75static int ext4_freeze(struct super_block *sb); 75static int ext4_freeze(struct super_block *sb);
76static int ext4_get_sb(struct file_system_type *fs_type, int flags, 76static struct dentry *ext4_mount(struct file_system_type *fs_type, int flags,
77 const char *dev_name, void *data, struct vfsmount *mnt); 77 const char *dev_name, void *data);
78static void ext4_destroy_lazyinit_thread(void); 78static void ext4_destroy_lazyinit_thread(void);
79static void ext4_unregister_li_request(struct super_block *sb); 79static void ext4_unregister_li_request(struct super_block *sb);
80 80
@@ -82,7 +82,7 @@ static void ext4_unregister_li_request(struct super_block *sb);
82static struct file_system_type ext3_fs_type = { 82static struct file_system_type ext3_fs_type = {
83 .owner = THIS_MODULE, 83 .owner = THIS_MODULE,
84 .name = "ext3", 84 .name = "ext3",
85 .get_sb = ext4_get_sb, 85 .mount = ext4_mount,
86 .kill_sb = kill_block_super, 86 .kill_sb = kill_block_super,
87 .fs_flags = FS_REQUIRES_DEV, 87 .fs_flags = FS_REQUIRES_DEV,
88}; 88};
@@ -4667,17 +4667,17 @@ out:
4667 4667
4668#endif 4668#endif
4669 4669
4670static int ext4_get_sb(struct file_system_type *fs_type, int flags, 4670static struct dentry *ext4_mount(struct file_system_type *fs_type, int flags,
4671 const char *dev_name, void *data, struct vfsmount *mnt) 4671 const char *dev_name, void *data)
4672{ 4672{
4673 return get_sb_bdev(fs_type, flags, dev_name, data, ext4_fill_super,mnt); 4673 return mount_bdev(fs_type, flags, dev_name, data, ext4_fill_super);
4674} 4674}
4675 4675
4676#if !defined(CONFIG_EXT2_FS) && !defined(CONFIG_EXT2_FS_MODULE) && defined(CONFIG_EXT4_USE_FOR_EXT23) 4676#if !defined(CONFIG_EXT2_FS) && !defined(CONFIG_EXT2_FS_MODULE) && defined(CONFIG_EXT4_USE_FOR_EXT23)
4677static struct file_system_type ext2_fs_type = { 4677static struct file_system_type ext2_fs_type = {
4678 .owner = THIS_MODULE, 4678 .owner = THIS_MODULE,
4679 .name = "ext2", 4679 .name = "ext2",
4680 .get_sb = ext4_get_sb, 4680 .mount = ext4_mount,
4681 .kill_sb = kill_block_super, 4681 .kill_sb = kill_block_super,
4682 .fs_flags = FS_REQUIRES_DEV, 4682 .fs_flags = FS_REQUIRES_DEV,
4683}; 4683};
@@ -4722,7 +4722,7 @@ static inline void unregister_as_ext3(void) { }
4722static struct file_system_type ext4_fs_type = { 4722static struct file_system_type ext4_fs_type = {
4723 .owner = THIS_MODULE, 4723 .owner = THIS_MODULE,
4724 .name = "ext4", 4724 .name = "ext4",
4725 .get_sb = ext4_get_sb, 4725 .mount = ext4_mount,
4726 .kill_sb = kill_block_super, 4726 .kill_sb = kill_block_super,
4727 .fs_flags = FS_REQUIRES_DEV, 4727 .fs_flags = FS_REQUIRES_DEV,
4728}; 4728};