[PATCH] uml: fix mknod

Fix UML hostfs mknod(): userspace has differernt dev_t size and encoding
than kernel, so extract major/minor and reencode using glibc makedev()
macro.

Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Acked-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Johannes Stezenbach 2007-01-29 13:19:44 -08:00 committed by Linus Torvalds
parent 7a238fcba0
commit 88f6cd0c3b
3 changed files with 4 additions and 4 deletions

View file

@ -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);

View file

@ -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;

View file

@ -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);
}