patch-1.3.46 linux/arch/alpha/kernel/osf_sys.c

• Lines: 36
• Date: Mon Dec 11 06:56:35 1995
• Orig file: v1.3.45/linux/arch/alpha/kernel/osf_sys.c
• Orig date: Mon Sep 18 14:53:48 1995

diff -u --recursive --new-file v1.3.45/linux/arch/alpha/kernel/osf_sys.c linux/arch/alpha/kernel/osf_sys.c
@@ -32,7 +32,7 @@
 #include <asm/system.h>
 #include <asm/io.h>
 
-extern int do_mount(kdev_t, const char *, char *, int, void *);
+extern int do_mount(kdev_t, const char *, const char *, char *, int, void *);
 extern int do_pipe(int *);
 
 extern struct file_operations * get_blkfops(unsigned int);
@@ -308,7 +308,7 @@
 	retval = getdev(tmp.devname, 0, &inode);
 	if (retval)
 		return retval;
-	retval = do_mount(inode->i_rdev, dirname, "ext2", flags, NULL);
+	retval = do_mount(inode->i_rdev, tmp.devname, dirname, "ext2", flags, NULL);
 	if (retval)
 		putdev(inode);
 	iput(inode);
@@ -328,7 +328,7 @@
 	retval = getdev(tmp.devname, 1, &inode);
 	if (retval)
 		return retval;
-	retval = do_mount(inode->i_rdev, dirname, "iso9660", flags, NULL);
+	retval = do_mount(inode->i_rdev, tmp.devname, dirname, "iso9660", flags, NULL);
 	if (retval)
 		putdev(inode);
 	iput(inode);
@@ -348,7 +348,7 @@
 	dev = get_unnamed_dev();
 	if (!dev)
 		return -ENODEV;
-	retval = do_mount(dev, dirname, "proc", flags, NULL);
+	retval = do_mount(dev, "", dirname, "proc", flags, NULL);
 	if (retval)
 		put_unnamed_dev(dev);
 	return retval;