diff options
Diffstat (limited to 'fs/romfs/super.c')
-rw-r--r-- | fs/romfs/super.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/fs/romfs/super.c b/fs/romfs/super.c index 42d213546894..6647f90e55cd 100644 --- a/fs/romfs/super.c +++ b/fs/romfs/super.c | |||
@@ -282,6 +282,7 @@ error: | |||
282 | static const struct file_operations romfs_dir_operations = { | 282 | static const struct file_operations romfs_dir_operations = { |
283 | .read = generic_read_dir, | 283 | .read = generic_read_dir, |
284 | .readdir = romfs_readdir, | 284 | .readdir = romfs_readdir, |
285 | .llseek = default_llseek, | ||
285 | }; | 286 | }; |
286 | 287 | ||
287 | static const struct inode_operations romfs_dir_inode_operations = { | 288 | static const struct inode_operations romfs_dir_inode_operations = { |
@@ -551,20 +552,19 @@ error_rsb: | |||
551 | /* | 552 | /* |
552 | * get a superblock for mounting | 553 | * get a superblock for mounting |
553 | */ | 554 | */ |
554 | static int romfs_get_sb(struct file_system_type *fs_type, | 555 | static struct dentry *romfs_mount(struct file_system_type *fs_type, |
555 | int flags, const char *dev_name, | 556 | int flags, const char *dev_name, |
556 | void *data, struct vfsmount *mnt) | 557 | void *data) |
557 | { | 558 | { |
558 | int ret = -EINVAL; | 559 | struct dentry *ret = ERR_PTR(-EINVAL); |
559 | 560 | ||
560 | #ifdef CONFIG_ROMFS_ON_MTD | 561 | #ifdef CONFIG_ROMFS_ON_MTD |
561 | 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); |
562 | mnt); | ||
563 | #endif | 563 | #endif |
564 | #ifdef CONFIG_ROMFS_ON_BLOCK | 564 | #ifdef CONFIG_ROMFS_ON_BLOCK |
565 | if (ret == -EINVAL) | 565 | if (ret == ERR_PTR(-EINVAL)) |
566 | ret = get_sb_bdev(fs_type, flags, dev_name, data, | 566 | ret = mount_bdev(fs_type, flags, dev_name, data, |
567 | romfs_fill_super, mnt); | 567 | romfs_fill_super); |
568 | #endif | 568 | #endif |
569 | return ret; | 569 | return ret; |
570 | } | 570 | } |
@@ -591,7 +591,7 @@ static void romfs_kill_sb(struct super_block *sb) | |||
591 | static struct file_system_type romfs_fs_type = { | 591 | static struct file_system_type romfs_fs_type = { |
592 | .owner = THIS_MODULE, | 592 | .owner = THIS_MODULE, |
593 | .name = "romfs", | 593 | .name = "romfs", |
594 | .get_sb = romfs_get_sb, | 594 | .mount = romfs_mount, |
595 | .kill_sb = romfs_kill_sb, | 595 | .kill_sb = romfs_kill_sb, |
596 | .fs_flags = FS_REQUIRES_DEV, | 596 | .fs_flags = FS_REQUIRES_DEV, |
597 | }; | 597 | }; |