From 36a0c4eb2bfbfee26d3c978adcdd844117880392 Mon Sep 17 00:00:00 2001
From: Johannes Stezenbach <js@linuxtv.org>
Date: Mon, 29 Jan 2007 13:19:44 -0800
Subject: [PATCH] --- yaml --- r: 45901 b: refs/heads/master c:
 88f6cd0c3bb5db2619103f834d4167b7d0d9899c h: refs/heads/master i:   45899:
 a22be730aa5f90c940183afdcd66ac8d8a27b698 v: v3

---
 [refs]                        | 2 +-
 trunk/fs/hostfs/hostfs.h      | 2 +-
 trunk/fs/hostfs/hostfs_kern.c | 2 +-
 trunk/fs/hostfs/hostfs_user.c | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 66ac44a94708..e4989f9a74ed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7a238fcba0629b6f2edbcd37458bae56fcf36be5
+refs/heads/master: 88f6cd0c3bb5db2619103f834d4167b7d0d9899c
diff --git a/trunk/fs/hostfs/hostfs.h b/trunk/fs/hostfs/hostfs.h
index cca3fb693f99..70543b17e4c7 100644
--- a/trunk/fs/hostfs/hostfs.h
+++ b/trunk/fs/hostfs/hostfs.h
@@ -76,7 +76,7 @@ extern int make_symlink(const char *from, const char *to);
 extern int unlink_file(const char *file);
 extern int do_mkdir(const char *file, int mode);
 extern int do_rmdir(const char *file);
-extern int do_mknod(const char *file, int mode, int dev);
+extern int do_mknod(const char *file, int mode, unsigned int major, unsigned int minor);
 extern int link_file(const char *from, const char *to);
 extern int do_readlink(char *file, char *buf, int size);
 extern int rename_file(char *from, char *to);
diff --git a/trunk/fs/hostfs/hostfs_kern.c b/trunk/fs/hostfs/hostfs_kern.c
index 1e6fc3799876..69a376f35a68 100644
--- a/trunk/fs/hostfs/hostfs_kern.c
+++ b/trunk/fs/hostfs/hostfs_kern.c
@@ -755,7 +755,7 @@ int hostfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev)
 		goto out_put;
 
 	init_special_inode(inode, mode, dev);
-	err = do_mknod(name, mode, dev);
+	err = do_mknod(name, mode, MAJOR(dev), MINOR(dev));
 	if(err)
 		goto out_free;
 
diff --git a/trunk/fs/hostfs/hostfs_user.c b/trunk/fs/hostfs/hostfs_user.c
index 23b7cee72123..1ed5ea389f15 100644
--- a/trunk/fs/hostfs/hostfs_user.c
+++ b/trunk/fs/hostfs/hostfs_user.c
@@ -295,11 +295,11 @@ int do_rmdir(const char *file)
 	return(0);
 }
 
-int do_mknod(const char *file, int mode, int dev)
+int do_mknod(const char *file, int mode, unsigned int major, unsigned int minor)
 {
 	int err;
 
-	err = mknod(file, mode, dev);
+	err = mknod(file, mode, makedev(major, minor));
 	if(err) return(-errno);
 	return(0);
 }