From 967665738785c7dfa47e3cb50d0e8133edbd3161 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Wed, 28 Oct 2009 19:51:17 +0100 Subject: [PATCH] --- yaml --- r: 175010 b: refs/heads/master c: 073120cc28ad9f6003452c8bb9d15a87b1820201 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/base/devtmpfs.c | 9 ++------- trunk/include/linux/device.h | 2 +- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 69aebc5b5052..05c68bd6f9b9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ed413ae6e7813d3227eef43bc6d84ca4f4fe6b21 +refs/heads/master: 073120cc28ad9f6003452c8bb9d15a87b1820201 diff --git a/trunk/drivers/base/devtmpfs.c b/trunk/drivers/base/devtmpfs.c index 1cf498fd2b52..880a203b6688 100644 --- a/trunk/drivers/base/devtmpfs.c +++ b/trunk/drivers/base/devtmpfs.c @@ -332,9 +332,8 @@ int devtmpfs_delete_node(struct device *dev) * If configured, or requested by the commandline, devtmpfs will be * 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; if (!dev_mount) @@ -343,15 +342,11 @@ int devtmpfs_mount(const char *mountpoint) if (!dev_mnt) return 0; - err = kern_path(mountpoint, LOOKUP_FOLLOW, &path); - if (err) - return err; - err = do_add_mount(dev_mnt, &path, 0, NULL); + err = sys_mount("devtmpfs", (char *)mntdir, "devtmpfs", MS_SILENT, NULL); if (err) printk(KERN_INFO "devtmpfs: error mounting %i\n", err); else printk(KERN_INFO "devtmpfs: mounted\n"); - path_put(&path); return err; } diff --git a/trunk/include/linux/device.h b/trunk/include/linux/device.h index 2ea3e4921812..2a73d9bcbc9c 100644 --- a/trunk/include/linux/device.h +++ b/trunk/include/linux/device.h @@ -558,7 +558,7 @@ extern void wait_for_device_probe(void); #ifdef CONFIG_DEVTMPFS extern int devtmpfs_create_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 static inline int devtmpfs_create_node(struct device *dev) { return 0; } static inline int devtmpfs_delete_node(struct device *dev) { return 0; }