Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 073120cc authored by Kay Sievers's avatar Kay Sievers Committed by Greg Kroah-Hartman
Browse files

Driver Core: devtmpfs: use sys_mount() 



Signed-off-by: default avatarKay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ed413ae6

drivers/base/devtmpfs.c

+2 −7
Original line number Diff line number Diff line
@@ -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;

}

include/linux/device.h

+1 −1
Original line number Diff line number Diff line
@@ -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; }