lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Driver Core: devtmpfs: use sys_mount()

Browse Source 
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Kay Sievers
2009-10-28 19:51:17 +01:00
committed by Greg Kroah-Hartman
parent ed413ae6e7
commit 073120cc28
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/base/devtmpfs.c
View File

@@ -332,9 +332,8 @@ out:
* If configured, or requested by the commandline, devtmpfs will be * If configured, or requested by the commandline, devtmpfs will be
* auto-mounted after the kernel mounted the root filesystem. * auto-mounted after the kernel mounted the root filesystem.
*/ */
int devtmpfs_mount(const char *mountpoint) int devtmpfs_mount(const char *mntdir)
{ {
struct path path;
int err; int err;
if (!dev_mount) if (!dev_mount)
@@ -343,15 +342,11 @@ int devtmpfs_mount(const char *mountpoint)
if (!dev_mnt) if (!dev_mnt)
return 0; return 0;
err = kern_path(mountpoint, LOOKUP_FOLLOW, &path); err = sys_mount("devtmpfs", (char *)mntdir, "devtmpfs", MS_SILENT, NULL);
if (err)
return err;
err = do_add_mount(dev_mnt, &path, 0, NULL);
if (err) if (err)
printk(KERN_INFO "devtmpfs: error mounting %i\n", err); printk(KERN_INFO "devtmpfs: error mounting %i\n", err);
else else
printk(KERN_INFO "devtmpfs: mounted\n"); printk(KERN_INFO "devtmpfs: mounted\n");
path_put(&path);
return err; return err;
} }

2
include/linux/device.h
View File

@@ -558,7 +558,7 @@ extern void wait_for_device_probe(void);
#ifdef CONFIG_DEVTMPFS #ifdef CONFIG_DEVTMPFS
extern int devtmpfs_create_node(struct device *dev); extern int devtmpfs_create_node(struct device *dev);
extern int devtmpfs_delete_node(struct device *dev); extern int devtmpfs_delete_node(struct device *dev);
extern int devtmpfs_mount(const char *mountpoint); extern int devtmpfs_mount(const char *mntdir);
#else #else
static inline int devtmpfs_create_node(struct device *dev) { return 0; } static inline int devtmpfs_create_node(struct device *dev) { return 0; }
static inline int devtmpfs_delete_node(struct device *dev) { return 0; } static inline int devtmpfs_delete_node(struct device *dev) { return 0; }