Showing the changes to drivers/base/devtmpfs.c (1 of 25 files). Show all
Unified · Split
| @@ -29,33 +29,33 @@ · 28 unmodified lines | ||
| 29 | 29 | static struct vfsmount *dev_mnt; |
| 30 | 30 | |
| 31 | 31 | #if defined CONFIG_DEVTMPFS_MOUNT |
| 32 | −static int dev_mount = 1; | |
| 32 | +static int mount_dev = 1; | |
| 33 | 33 | #else |
| 34 | −static int dev_mount; | |
| 34 | +static int mount_dev; | |
| 35 | 35 | #endif |
| 36 | 36 | |
| 37 | 37 | static DEFINE_MUTEX(dirlock); |
| 38 | 38 | |
| 39 | 39 | static int __init mount_param(char *str) |
| 40 | 40 | { |
| 41 | − dev_mount = simple_strtoul(str, NULL, 0); | |
| 41 | + mount_dev = simple_strtoul(str, NULL, 0); | |
| 42 | 42 | return 1; |
| 43 | 43 | } |
| 44 | 44 | __setup("devtmpfs.mount=", mount_param); |
| 45 | 45 | |
| 46 | −static int dev_get_sb(struct file_system_type *fs_type, int flags, | |
| 47 | − const char *dev_name, void *data, struct vfsmount *mnt) | |
| 46 | +static struct dentry *dev_mount(struct file_system_type *fs_type, int flags, | |
| 47 | + const char *dev_name, void *data) | |
| 48 | 48 | { |
| 49 | 49 | #ifdef CONFIG_TMPFS |
| 50 | − return get_sb_single(fs_type, flags, data, shmem_fill_super, mnt); | |
| 50 | + return mount_single(fs_type, flags, data, shmem_fill_super); | |
| 51 | 51 | #else |
| 52 | − return get_sb_single(fs_type, flags, data, ramfs_fill_super, mnt); | |
| 52 | + return mount_single(fs_type, flags, data, ramfs_fill_super); | |
| 53 | 53 | #endif |
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | static struct file_system_type dev_fs_type = { |
| 57 | 57 | .name = "devtmpfs", |
| 58 | − .get_sb = dev_get_sb, | |
| 58 | + .mount = dev_mount, | |
| 59 | 59 | .kill_sb = kill_litter_super, |
| 60 | 60 | }; |
| 61 | 61 | |
| @@ -351,7 +351,7 @@ int devtmpfs_mount(const char *mntdir) · 289 unmodified lines | ||
| 351 | 351 | { |
| 352 | 352 | int err; |
| 353 | 353 | |
| 354 | − if (!dev_mount) | |
| 354 | + if (!mount_dev) | |
| 355 | 355 | return 0; |
| 356 | 356 | |
| 357 | 357 | if (!dev_mnt) |