diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2010-07-24 17:48:30 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2010-10-29 04:16:28 -0400 |
commit | fc14f2fef682df677d64a145256dbd263df2aa7b (patch) | |
tree | 74f6b939fbad959a43c04ec646cd0adc8af5f53a /drivers/base/devtmpfs.c | |
parent | 848b83a59b772b8f102bc5e3f1187c2fa5676959 (diff) |
convert get_sb_single() users
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers/base/devtmpfs.c')
-rw-r--r-- | drivers/base/devtmpfs.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c index af0600143d1c..82bbb5967aa9 100644 --- a/drivers/base/devtmpfs.c +++ b/drivers/base/devtmpfs.c | |||
@@ -29,33 +29,33 @@ | |||
29 | static struct vfsmount *dev_mnt; | 29 | static struct vfsmount *dev_mnt; |
30 | 30 | ||
31 | #if defined CONFIG_DEVTMPFS_MOUNT | 31 | #if defined CONFIG_DEVTMPFS_MOUNT |
32 | static int dev_mount = 1; | 32 | static int mount_dev = 1; |
33 | #else | 33 | #else |
34 | static int dev_mount; | 34 | static int mount_dev; |
35 | #endif | 35 | #endif |
36 | 36 | ||
37 | static DEFINE_MUTEX(dirlock); | 37 | static DEFINE_MUTEX(dirlock); |
38 | 38 | ||
39 | static int __init mount_param(char *str) | 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 | return 1; | 42 | return 1; |
43 | } | 43 | } |
44 | __setup("devtmpfs.mount=", mount_param); | 44 | __setup("devtmpfs.mount=", mount_param); |
45 | 45 | ||
46 | static int dev_get_sb(struct file_system_type *fs_type, int flags, | 46 | static struct dentry *dev_mount(struct file_system_type *fs_type, int flags, |
47 | const char *dev_name, void *data, struct vfsmount *mnt) | 47 | const char *dev_name, void *data) |
48 | { | 48 | { |
49 | #ifdef CONFIG_TMPFS | 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 | #else | 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 | #endif | 53 | #endif |
54 | } | 54 | } |
55 | 55 | ||
56 | static struct file_system_type dev_fs_type = { | 56 | static struct file_system_type dev_fs_type = { |
57 | .name = "devtmpfs", | 57 | .name = "devtmpfs", |
58 | .get_sb = dev_get_sb, | 58 | .mount = dev_mount, |
59 | .kill_sb = kill_litter_super, | 59 | .kill_sb = kill_litter_super, |
60 | }; | 60 | }; |
61 | 61 | ||
@@ -351,7 +351,7 @@ int devtmpfs_mount(const char *mntdir) | |||
351 | { | 351 | { |
352 | int err; | 352 | int err; |
353 | 353 | ||
354 | if (!dev_mount) | 354 | if (!mount_dev) |
355 | return 0; | 355 | return 0; |
356 | 356 | ||
357 | if (!dev_mnt) | 357 | if (!dev_mnt) |