diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/ia64/kernel/perfmon.c | 9 | ||||
-rw-r--r-- | arch/powerpc/platforms/cell/spufs/inode.c | 10 | ||||
-rw-r--r-- | arch/s390/hypfs/inode.c | 8 |
3 files changed, 13 insertions, 14 deletions
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c index 6b1852f7f972..39e534f5a3b0 100644 --- a/arch/ia64/kernel/perfmon.c +++ b/arch/ia64/kernel/perfmon.c | |||
@@ -618,16 +618,15 @@ pfm_get_unmapped_area(struct file *file, unsigned long addr, unsigned long len, | |||
618 | } | 618 | } |
619 | 619 | ||
620 | 620 | ||
621 | static int | 621 | static struct dentry * |
622 | pfmfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data, | 622 | pfmfs_mount(struct file_system_type *fs_type, int flags, const char *dev_name, void *data) |
623 | struct vfsmount *mnt) | ||
624 | { | 623 | { |
625 | return get_sb_pseudo(fs_type, "pfm:", NULL, PFMFS_MAGIC, mnt); | 624 | return mount_pseudo(fs_type, "pfm:", NULL, PFMFS_MAGIC); |
626 | } | 625 | } |
627 | 626 | ||
628 | static struct file_system_type pfm_fs_type = { | 627 | static struct file_system_type pfm_fs_type = { |
629 | .name = "pfmfs", | 628 | .name = "pfmfs", |
630 | .get_sb = pfmfs_get_sb, | 629 | .mount = pfmfs_mount, |
631 | .kill_sb = kill_anon_super, | 630 | .kill_sb = kill_anon_super, |
632 | }; | 631 | }; |
633 | 632 | ||
diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c index 5dec408d6703..3532b92de983 100644 --- a/arch/powerpc/platforms/cell/spufs/inode.c +++ b/arch/powerpc/platforms/cell/spufs/inode.c | |||
@@ -798,17 +798,17 @@ spufs_fill_super(struct super_block *sb, void *data, int silent) | |||
798 | return spufs_create_root(sb, data); | 798 | return spufs_create_root(sb, data); |
799 | } | 799 | } |
800 | 800 | ||
801 | static int | 801 | static struct dentry * |
802 | spufs_get_sb(struct file_system_type *fstype, int flags, | 802 | spufs_mount(struct file_system_type *fstype, int flags, |
803 | const char *name, void *data, struct vfsmount *mnt) | 803 | const char *name, void *data) |
804 | { | 804 | { |
805 | return get_sb_single(fstype, flags, data, spufs_fill_super, mnt); | 805 | return mount_single(fstype, flags, data, spufs_fill_super); |
806 | } | 806 | } |
807 | 807 | ||
808 | static struct file_system_type spufs_type = { | 808 | static struct file_system_type spufs_type = { |
809 | .owner = THIS_MODULE, | 809 | .owner = THIS_MODULE, |
810 | .name = "spufs", | 810 | .name = "spufs", |
811 | .get_sb = spufs_get_sb, | 811 | .mount = spufs_mount, |
812 | .kill_sb = kill_litter_super, | 812 | .kill_sb = kill_litter_super, |
813 | }; | 813 | }; |
814 | 814 | ||
diff --git a/arch/s390/hypfs/inode.c b/arch/s390/hypfs/inode.c index 74d98670be27..47cc446dab8f 100644 --- a/arch/s390/hypfs/inode.c +++ b/arch/s390/hypfs/inode.c | |||
@@ -316,10 +316,10 @@ static int hypfs_fill_super(struct super_block *sb, void *data, int silent) | |||
316 | return 0; | 316 | return 0; |
317 | } | 317 | } |
318 | 318 | ||
319 | static int hypfs_get_super(struct file_system_type *fst, int flags, | 319 | static struct dentry *hypfs_mount(struct file_system_type *fst, int flags, |
320 | const char *devname, void *data, struct vfsmount *mnt) | 320 | const char *devname, void *data) |
321 | { | 321 | { |
322 | return get_sb_single(fst, flags, data, hypfs_fill_super, mnt); | 322 | return mount_single(fst, flags, data, hypfs_fill_super); |
323 | } | 323 | } |
324 | 324 | ||
325 | static void hypfs_kill_super(struct super_block *sb) | 325 | static void hypfs_kill_super(struct super_block *sb) |
@@ -455,7 +455,7 @@ static const struct file_operations hypfs_file_ops = { | |||
455 | static struct file_system_type hypfs_type = { | 455 | static struct file_system_type hypfs_type = { |
456 | .owner = THIS_MODULE, | 456 | .owner = THIS_MODULE, |
457 | .name = "s390_hypfs", | 457 | .name = "s390_hypfs", |
458 | .get_sb = hypfs_get_super, | 458 | .mount = hypfs_mount, |
459 | .kill_sb = hypfs_kill_super | 459 | .kill_sb = hypfs_kill_super |
460 | }; | 460 | }; |
461 | 461 | ||