diff options
Diffstat (limited to 'fs/ocfs2')
-rw-r--r-- | fs/ocfs2/super.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c index 56f0cb395820..f02c0ef31578 100644 --- a/fs/ocfs2/super.c +++ b/fs/ocfs2/super.c | |||
@@ -1236,14 +1236,12 @@ read_super_error: | |||
1236 | return status; | 1236 | return status; |
1237 | } | 1237 | } |
1238 | 1238 | ||
1239 | static int ocfs2_get_sb(struct file_system_type *fs_type, | 1239 | static struct dentry *ocfs2_mount(struct file_system_type *fs_type, |
1240 | int flags, | 1240 | int flags, |
1241 | const char *dev_name, | 1241 | const char *dev_name, |
1242 | void *data, | 1242 | void *data) |
1243 | struct vfsmount *mnt) | ||
1244 | { | 1243 | { |
1245 | return get_sb_bdev(fs_type, flags, dev_name, data, ocfs2_fill_super, | 1244 | return mount_bdev(fs_type, flags, dev_name, data, ocfs2_fill_super); |
1246 | mnt); | ||
1247 | } | 1245 | } |
1248 | 1246 | ||
1249 | static void ocfs2_kill_sb(struct super_block *sb) | 1247 | static void ocfs2_kill_sb(struct super_block *sb) |
@@ -1267,8 +1265,7 @@ out: | |||
1267 | static struct file_system_type ocfs2_fs_type = { | 1265 | static struct file_system_type ocfs2_fs_type = { |
1268 | .owner = THIS_MODULE, | 1266 | .owner = THIS_MODULE, |
1269 | .name = "ocfs2", | 1267 | .name = "ocfs2", |
1270 | .get_sb = ocfs2_get_sb, /* is this called when we mount | 1268 | .mount = ocfs2_mount, |
1271 | * the fs? */ | ||
1272 | .kill_sb = ocfs2_kill_sb, | 1269 | .kill_sb = ocfs2_kill_sb, |
1273 | 1270 | ||
1274 | .fs_flags = FS_REQUIRES_DEV|FS_RENAME_DOES_D_MOVE, | 1271 | .fs_flags = FS_REQUIRES_DEV|FS_RENAME_DOES_D_MOVE, |