diff options
Diffstat (limited to 'fs/ramfs/inode.c')
| -rw-r--r-- | fs/ramfs/inode.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/fs/ramfs/inode.c b/fs/ramfs/inode.c index 67fadb1ad2c1..eacb166fb259 100644 --- a/fs/ramfs/inode.c +++ b/fs/ramfs/inode.c | |||
| @@ -255,17 +255,16 @@ fail: | |||
| 255 | return err; | 255 | return err; |
| 256 | } | 256 | } |
| 257 | 257 | ||
| 258 | int ramfs_get_sb(struct file_system_type *fs_type, | 258 | struct dentry *ramfs_mount(struct file_system_type *fs_type, |
| 259 | int flags, const char *dev_name, void *data, struct vfsmount *mnt) | 259 | int flags, const char *dev_name, void *data) |
| 260 | { | 260 | { |
| 261 | return get_sb_nodev(fs_type, flags, data, ramfs_fill_super, mnt); | 261 | return mount_nodev(fs_type, flags, data, ramfs_fill_super); |
| 262 | } | 262 | } |
| 263 | 263 | ||
| 264 | static int rootfs_get_sb(struct file_system_type *fs_type, | 264 | static struct dentry *rootfs_mount(struct file_system_type *fs_type, |
| 265 | int flags, const char *dev_name, void *data, struct vfsmount *mnt) | 265 | int flags, const char *dev_name, void *data) |
| 266 | { | 266 | { |
| 267 | return get_sb_nodev(fs_type, flags|MS_NOUSER, data, ramfs_fill_super, | 267 | return mount_nodev(fs_type, flags|MS_NOUSER, data, ramfs_fill_super); |
| 268 | mnt); | ||
| 269 | } | 268 | } |
| 270 | 269 | ||
| 271 | static void ramfs_kill_sb(struct super_block *sb) | 270 | static void ramfs_kill_sb(struct super_block *sb) |
| @@ -276,12 +275,12 @@ static void ramfs_kill_sb(struct super_block *sb) | |||
| 276 | 275 | ||
| 277 | static struct file_system_type ramfs_fs_type = { | 276 | static struct file_system_type ramfs_fs_type = { |
| 278 | .name = "ramfs", | 277 | .name = "ramfs", |
| 279 | .get_sb = ramfs_get_sb, | 278 | .mount = ramfs_mount, |
| 280 | .kill_sb = ramfs_kill_sb, | 279 | .kill_sb = ramfs_kill_sb, |
| 281 | }; | 280 | }; |
| 282 | static struct file_system_type rootfs_fs_type = { | 281 | static struct file_system_type rootfs_fs_type = { |
| 283 | .name = "rootfs", | 282 | .name = "rootfs", |
| 284 | .get_sb = rootfs_get_sb, | 283 | .mount = rootfs_mount, |
| 285 | .kill_sb = kill_litter_super, | 284 | .kill_sb = kill_litter_super, |
| 286 | }; | 285 | }; |
| 287 | 286 | ||
