diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2010-07-24 16:56:46 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2010-10-29 04:16:26 -0400 |
commit | 848b83a59b772b8f102bc5e3f1187c2fa5676959 (patch) | |
tree | d09a3755252e73f4bef000ffafbc0e9fd72d1a38 /fs/romfs/super.c | |
parent | 152a08366671080f27b32e0c411ad620c5f88b57 (diff) |
convert get_sb_mtd() users to ->mount()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/romfs/super.c')
-rw-r--r-- | fs/romfs/super.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/fs/romfs/super.c b/fs/romfs/super.c index 268580535c92..6647f90e55cd 100644 --- a/fs/romfs/super.c +++ b/fs/romfs/super.c | |||
@@ -552,20 +552,19 @@ error_rsb: | |||
552 | /* | 552 | /* |
553 | * get a superblock for mounting | 553 | * get a superblock for mounting |
554 | */ | 554 | */ |
555 | static int romfs_get_sb(struct file_system_type *fs_type, | 555 | static struct dentry *romfs_mount(struct file_system_type *fs_type, |
556 | int flags, const char *dev_name, | 556 | int flags, const char *dev_name, |
557 | void *data, struct vfsmount *mnt) | 557 | void *data) |
558 | { | 558 | { |
559 | int ret = -EINVAL; | 559 | struct dentry *ret = ERR_PTR(-EINVAL); |
560 | 560 | ||
561 | #ifdef CONFIG_ROMFS_ON_MTD | 561 | #ifdef CONFIG_ROMFS_ON_MTD |
562 | ret = get_sb_mtd(fs_type, flags, dev_name, data, romfs_fill_super, | 562 | ret = mount_mtd(fs_type, flags, dev_name, data, romfs_fill_super); |
563 | mnt); | ||
564 | #endif | 563 | #endif |
565 | #ifdef CONFIG_ROMFS_ON_BLOCK | 564 | #ifdef CONFIG_ROMFS_ON_BLOCK |
566 | if (ret == -EINVAL) | 565 | if (ret == ERR_PTR(-EINVAL)) |
567 | ret = get_sb_bdev(fs_type, flags, dev_name, data, | 566 | ret = mount_bdev(fs_type, flags, dev_name, data, |
568 | romfs_fill_super, mnt); | 567 | romfs_fill_super); |
569 | #endif | 568 | #endif |
570 | return ret; | 569 | return ret; |
571 | } | 570 | } |
@@ -592,7 +591,7 @@ static void romfs_kill_sb(struct super_block *sb) | |||
592 | static struct file_system_type romfs_fs_type = { | 591 | static struct file_system_type romfs_fs_type = { |
593 | .owner = THIS_MODULE, | 592 | .owner = THIS_MODULE, |
594 | .name = "romfs", | 593 | .name = "romfs", |
595 | .get_sb = romfs_get_sb, | 594 | .mount = romfs_mount, |
596 | .kill_sb = romfs_kill_sb, | 595 | .kill_sb = romfs_kill_sb, |
597 | .fs_flags = FS_REQUIRES_DEV, | 596 | .fs_flags = FS_REQUIRES_DEV, |
598 | }; | 597 | }; |