diff options
author | Kay Sievers <kay.sievers@vrfy.org> | 2009-10-28 14:51:17 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-11 14:24:51 -0500 |
commit | 073120cc28ad9f6003452c8bb9d15a87b1820201 (patch) | |
tree | e4c523586ad6d77069004d7f51d4ea65a7c507b2 | |
parent | ed413ae6e7813d3227eef43bc6d84ca4f4fe6b21 (diff) |
Driver Core: devtmpfs: use sys_mount()
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/base/devtmpfs.c | 9 | ||||
-rw-r--r-- | include/linux/device.h | 2 |
2 files changed, 3 insertions, 8 deletions
diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c index 1cf498fd2b52..880a203b6688 100644 --- a/drivers/base/devtmpfs.c +++ b/drivers/base/devtmpfs.c | |||
@@ -332,9 +332,8 @@ out: | |||
332 | * If configured, or requested by the commandline, devtmpfs will be | 332 | * If configured, or requested by the commandline, devtmpfs will be |
333 | * auto-mounted after the kernel mounted the root filesystem. | 333 | * auto-mounted after the kernel mounted the root filesystem. |
334 | */ | 334 | */ |
335 | int devtmpfs_mount(const char *mountpoint) | 335 | int devtmpfs_mount(const char *mntdir) |
336 | { | 336 | { |
337 | struct path path; | ||
338 | int err; | 337 | int err; |
339 | 338 | ||
340 | if (!dev_mount) | 339 | if (!dev_mount) |
@@ -343,15 +342,11 @@ int devtmpfs_mount(const char *mountpoint) | |||
343 | if (!dev_mnt) | 342 | if (!dev_mnt) |
344 | return 0; | 343 | return 0; |
345 | 344 | ||
346 | err = kern_path(mountpoint, LOOKUP_FOLLOW, &path); | 345 | err = sys_mount("devtmpfs", (char *)mntdir, "devtmpfs", MS_SILENT, NULL); |
347 | if (err) | ||
348 | return err; | ||
349 | err = do_add_mount(dev_mnt, &path, 0, NULL); | ||
350 | if (err) | 346 | if (err) |
351 | printk(KERN_INFO "devtmpfs: error mounting %i\n", err); | 347 | printk(KERN_INFO "devtmpfs: error mounting %i\n", err); |
352 | else | 348 | else |
353 | printk(KERN_INFO "devtmpfs: mounted\n"); | 349 | printk(KERN_INFO "devtmpfs: mounted\n"); |
354 | path_put(&path); | ||
355 | return err; | 350 | return err; |
356 | } | 351 | } |
357 | 352 | ||
diff --git a/include/linux/device.h b/include/linux/device.h index 2ea3e4921812..2a73d9bcbc9c 100644 --- a/include/linux/device.h +++ b/include/linux/device.h | |||
@@ -558,7 +558,7 @@ extern void wait_for_device_probe(void); | |||
558 | #ifdef CONFIG_DEVTMPFS | 558 | #ifdef CONFIG_DEVTMPFS |
559 | extern int devtmpfs_create_node(struct device *dev); | 559 | extern int devtmpfs_create_node(struct device *dev); |
560 | extern int devtmpfs_delete_node(struct device *dev); | 560 | extern int devtmpfs_delete_node(struct device *dev); |
561 | extern int devtmpfs_mount(const char *mountpoint); | 561 | extern int devtmpfs_mount(const char *mntdir); |
562 | #else | 562 | #else |
563 | static inline int devtmpfs_create_node(struct device *dev) { return 0; } | 563 | static inline int devtmpfs_create_node(struct device *dev) { return 0; } |
564 | static inline int devtmpfs_delete_node(struct device *dev) { return 0; } | 564 | static inline int devtmpfs_delete_node(struct device *dev) { return 0; } |