History

convert get_sb_single() users

Al Viro committed 16 years ago

Commit fc14f2f1 parent 848b83a25 files · +147 −139Browse files

Showing the changes to drivers/base/devtmpfs.c (1 of 25 files). Show all

Unified · Split

drivers/base/devtmpfs.c+9−9
@@ -29,33 +29,33 @@ · 28 unmodified lines
29static struct vfsmount *dev_mnt;29static struct vfsmount *dev_mnt;
30 30
31#if defined CONFIG_DEVTMPFS_MOUNT31#if defined CONFIG_DEVTMPFS_MOUNT
32static int dev_mount = 1;32static int mount_dev = 1;
33#else33#else
34static int dev_mount;34static int mount_dev;
35#endif35#endif
36 36
37static DEFINE_MUTEX(dirlock);37static DEFINE_MUTEX(dirlock);
38 38
39static int __init mount_param(char *str)39static 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
46static int dev_get_sb(struct file_system_type *fs_type, int flags,46static 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_TMPFS49#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#else51#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#endif53#endif
54}54}
55 55
56static struct file_system_type dev_fs_type = {56static 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) · 289 unmodified lines
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)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t