# This adds hostfs as an externfs plug-in.  This is heavily reworked
# from the existing hostfs to split it apart with the externfs interface
# between the pieces, and to change filenames.
# *** This now compiles and works somewhat - mount and ls work, you're taking
# your chances on anything else ***
Index: um/arch/um/drivers/ubd_user.c
===================================================================
--- um.orig/arch/um/drivers/ubd_user.c	2004-08-10 15:06:41.000000000 -0400
+++ um/arch/um/drivers/ubd_user.c	2004-08-10 15:06:54.000000000 -0400
@@ -44,7 +44,9 @@
 		printk("Couldn't stat '%s', err = %d\n", from_cow, -err);
 		return(1);
 	}
-	if((buf1.ust_dev == buf2.ust_dev) && (buf1.ust_ino == buf2.ust_ino))
+	if((buf1.ust_major == buf2.ust_major) && 
+	   (buf1.ust_minor == buf2.ust_minor) && 
+	   (buf1.ust_ino == buf2.ust_ino))
 		return(1);
 
 	printk("Backing file mismatch - \"%s\" requested,\n"
@@ -189,6 +191,7 @@
 			    data_offset_out);
 	if(!err)
 		return(fd);
+
 	os_close_file(fd);
  out:
 	return(err);
Index: um/arch/um/include/os.h
===================================================================
--- um.orig/arch/um/include/os.h	2004-08-10 15:06:41.000000000 -0400
+++ um/arch/um/include/os.h	2004-08-12 17:02:13.000000000 -0400
@@ -29,7 +29,8 @@
  * (if they are wrong here, they are wrong there...).
  */
 struct uml_stat {
-	int                ust_dev;        /* device */
+	int                ust_major;      /* device */
+	int                ust_minor;
 	unsigned long long ust_ino;        /* inode */
 	int                ust_mode;       /* protection */
 	int                ust_nlink;      /* number of hard links */
@@ -41,6 +42,8 @@
 	unsigned long      ust_atime;      /* time of last access */
 	unsigned long      ust_mtime;      /* time of last modification */
 	unsigned long      ust_ctime;      /* time of last change */
+	int                ust_rmajor;
+	int                ust_rminor;
 };
 
 struct openflags {
@@ -118,8 +121,13 @@
 }
   
 extern int os_stat_file(const char *file_name, struct uml_stat *buf);
+extern int os_lstat_file(const char *file_name, struct uml_stat *ubuf);
 extern int os_stat_fd(const int fd, struct uml_stat *buf);
 extern int os_access(const char *file, int mode);
+extern int os_set_file_time(const char *file, unsigned long access, 
+			    unsigned long mod);
+extern int os_set_file_perms(const char *file, int mode);
+extern int os_set_file_owner(const char *file, int owner, int group);
 extern void os_print_error(int error, const char* str);
 extern int os_get_exec_close(int fd, int *close_on_exec);
 extern int os_set_exec_close(int fd, int close_on_exec);
@@ -133,8 +141,15 @@
 extern int os_mode_fd(int fd, int mode);
 
 extern int os_seek_file(int fd, __u64 offset);
-extern void *os_open_dir(char *dir, int *err_out);
 extern int os_open_file(char *file, struct openflags flags, int mode);
+extern void *os_open_dir(char *dir, int *err_out);
+extern int os_seek_dir(void *stream, unsigned long long pos);
+extern int os_read_dir(void *stream, unsigned long long *ino_out, 
+		       char **name_out);
+extern int os_tell_dir(void *stream);
+extern int os_close_dir(void *stream);
+extern int os_remove_file(const char *file);
+extern int os_move_file(const char *from, const char *to);
 extern int os_truncate_file(const char *file, unsigned long long len);
 extern int os_truncate_fd(int fd, unsigned long long len);
 extern int os_read_file(int fd, void *buf, int len);
@@ -147,6 +162,12 @@
 extern int os_set_fd_block(int fd, int blocking);
 extern int os_accept_connection(int fd);
 extern int os_create_unix_socket(char *file, int len, int close_on_exec);
+extern int os_make_symlink(const char *to, const char *from);
+extern int os_read_symlink(const char *file, char *buf, int size);
+extern int os_link_file(const char *to, const char *from);
+extern int os_make_dir(const char *dir, int mode);
+extern int os_remove_dir(const char *dir);
+extern int os_make_dev(const char *name, int mode, int major, int minor);
 extern int os_shutdown_socket(int fd, int r, int w);
 extern void os_close_file(int fd);
 extern int os_rcv_fd(int fd, int *helper_pid_out);
@@ -169,6 +190,12 @@
 			     int r, int w, int x);
 extern int os_unmap_memory(void *addr, int len);
 extern void os_flush_stdout(void);
+extern int os_stat_filesystem(char *path, long *bsize_out, 
+			      long long *blocks_out, long long *bfree_out,
+			      long long *bavail_out, long long *files_out,
+			      long long *ffree_out, void *fsid_out, 
+			      int fsid_size, long *namelen_out, 
+			      long *spare_out);
 extern unsigned long long os_usecs(void);
 
 #endif
Index: um/arch/um/os-Linux/file.c
===================================================================
--- um.orig/arch/um/os-Linux/file.c	2004-08-10 15:06:41.000000000 -0400
+++ um/arch/um/os-Linux/file.c	2004-08-12 17:02:13.000000000 -0400
@@ -8,6 +8,9 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <signal.h>
+#include <utime.h>
+#include <dirent.h>
+#include <linux/kdev_t.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
@@ -15,6 +18,7 @@
 #include <sys/ioctl.h>
 #include <sys/mount.h>
 #include <sys/uio.h>
+#include <sys/vfs.h>
 #include "os.h"
 #include "user.h"
 #include "kern_util.h"
@@ -22,7 +26,8 @@
 static void copy_stat(struct uml_stat *dst, struct stat64 *src)
 {
 	*dst = ((struct uml_stat) {
-		.ust_dev     = src->st_dev,     /* device */
+		.ust_major   = MAJOR(src->st_dev),     /* device */
+		.ust_minor   = MINOR(src->st_dev),
 		.ust_ino     = src->st_ino,     /* inode */
 		.ust_mode    = src->st_mode,    /* protection */
 		.ust_nlink   = src->st_nlink,   /* number of hard links */
@@ -34,6 +39,8 @@
 		.ust_atime   = src->st_atime,   /* time of last access */
 		.ust_mtime   = src->st_mtime,   /* time of last modification */
 		.ust_ctime   = src->st_ctime,   /* time of last change */
+		.ust_rmajor  = MAJOR(src->st_rdev),
+		.ust_rminor  = MINOR(src->st_rdev),
 	});
 }
 
@@ -71,12 +78,29 @@
 	return(err);
 }
 
-int os_access(const char* file, int mode)
+int os_lstat_file(const char *file_name, struct uml_stat *ubuf)
+{
+	struct stat64 sbuf;
+	int err;
+
+	do {
+		err = lstat64(file_name, &sbuf);
+	} while((err < 0) && (errno == EINTR)) ;
+
+	if(err < 0) 
+		return(-errno);
+
+	if(ubuf != NULL)
+		copy_stat(ubuf, &sbuf);
+	return(err);
+}
+
+int os_access(const char *file, int mode)
 {
 	int amode, err;
 
-	amode=(mode&OS_ACC_R_OK ? R_OK : 0) | (mode&OS_ACC_W_OK ? W_OK : 0) |
-	      (mode&OS_ACC_X_OK ? X_OK : 0) | (mode&OS_ACC_F_OK ? F_OK : 0) ;
+	amode=(mode& OS_ACC_R_OK ? R_OK : 0) | (mode& OS_ACC_W_OK ? W_OK : 0) |
+	      (mode& OS_ACC_X_OK ? X_OK : 0) | (mode& OS_ACC_F_OK ? F_OK : 0) ;
 
 	err = access(file, amode);
 	if(err < 0)
@@ -85,6 +109,41 @@
 	return(0);
 }
 
+int os_set_file_time(const char *file, unsigned long access, unsigned long mod)
+{
+	struct utimbuf buf = ((struct utimbuf){ .actime = access, 
+						.modtime = mod });
+	int err;
+
+	err = utime(file, &buf);
+	if(err < 0)
+		return(-errno);
+
+	return(0);
+}
+
+int os_set_file_perms(const char *file, int mode)
+{
+	int err;
+
+	err = chmod(file, mode);
+	if(err < 0)
+		return(-errno);
+
+	return(0);
+}
+
+int os_set_file_owner(const char *file, int owner, int group)
+{
+	int err;
+
+	err = chown(file, owner, group);
+	if(err < 0)
+		return(-errno);
+
+	return(0);
+}
+
 void os_print_error(int error, const char* str)
 {
 	errno = error < 0 ? -error : error;
@@ -219,7 +278,7 @@
 	struct uml_stat buf;
 	int err;
 
-	err = os_stat_file(file, &buf);
+	err = os_lstat_file(file, &buf);
 	if(err < 0)
 		return(err);
 
@@ -288,6 +347,67 @@
 	return(dir);
 }
 
+int os_seek_dir(void *stream, unsigned long long pos)
+{
+	seekdir(stream, pos);
+	return(0);
+}
+
+int os_read_dir(void *stream, unsigned long long *ino_out, char **name_out)
+{
+	struct dirent *ent;
+
+	errno = 0;
+	ent = readdir(stream);
+	if(ent == NULL){
+		if(errno != 0)
+			return(-errno);
+		*name_out = NULL;
+		return(0);
+	}
+
+	*ino_out = ent->d_ino;
+	*name_out = ent->d_name;
+	return(0);
+}
+
+int os_tell_dir(void *stream)
+{
+	return(telldir(stream));
+}
+
+int os_close_dir(void *stream)
+{
+	int err;
+
+	err = closedir(stream);
+	if(err < 0)
+		return(-errno);
+	return(0);
+}
+
+int os_remove_file(const char *file)
+{
+	int err;
+
+	err = unlink(file);
+	if(err)
+		return(-errno);
+
+	return(0);
+}
+
+int os_move_file(const char *from, const char *to)
+{
+	int err;
+
+	err = rename(from, to);
+	if(err)
+		return(-errno);
+
+	return(0);
+}
+
 int os_truncate_fd(int fd, unsigned long long len)
 {
 	int err;
@@ -298,6 +418,16 @@
 	return(0);
 }
 
+int os_truncate_file(const char *file, unsigned long long len)
+{
+	int err;
+
+	err = truncate(file, len);
+	if(err)
+		return(-errno);
+	return(0);
+}
+
 int os_connect_socket(char *name)
 {
 	struct sockaddr_un sock;
@@ -656,6 +786,72 @@
 	return(sock);
 }
 
+int os_make_symlink(const char *to, const char *from)
+{
+	int err;
+
+	err = symlink(to, from);
+	if(err)
+		return(-errno);
+
+	return(0);
+}
+
+int os_read_symlink(const char *file, char *buf, int size)
+{
+	int err;
+
+	err = readlink(file, buf, size);
+	if(err < 0)
+		return(-errno);
+
+	return(err);
+}
+
+int os_link_file(const char *to, const char *from)
+{
+	int err;
+
+	err = link(to, from);
+	if(err)
+		return(-errno);
+
+	return(0);
+}
+
+int os_make_dir(const char *dir, int mode)
+{
+	int err;
+
+	err = mkdir(dir, mode);
+	if(err)
+		return(-errno);
+
+	return(0);
+}
+
+int os_make_dev(const char *name, int mode, int major, int minor)
+{
+	int err;
+
+	err = mknod(name, mode, MKDEV(major, minor));
+	if(err)
+		return(-errno);
+
+	return(0);
+}
+
+int os_remove_dir(const char *dir)
+{
+	int err;
+
+	err = rmdir(dir);
+	if(err)
+		return(-errno);
+
+	return(0);
+}
+
 void os_flush_stdout(void)
 {
 	fflush(stdout);
@@ -687,6 +883,38 @@
 	return(err);
 }
 
+int os_stat_filesystem(char *path, long *bsize_out, long long *blocks_out, 
+		       long long *bfree_out, long long *bavail_out, 
+		       long long *files_out, long long *ffree_out, 
+		       void *fsid_out, int fsid_size, long *namelen_out, 
+		       long *spare_out)
+{
+	struct statfs64 buf;
+	int err;
+
+	err = statfs64(path, &buf);
+	if(err < 0)
+		return(-errno);
+
+	*bsize_out = buf.f_bsize;
+	*blocks_out = buf.f_blocks;
+	*bfree_out = buf.f_bfree;
+	*bavail_out = buf.f_bavail;
+	*files_out = buf.f_files;
+	*ffree_out = buf.f_ffree;
+	memcpy(fsid_out, &buf.f_fsid, 
+	       sizeof(buf.f_fsid) > fsid_size ? fsid_size : 
+	       sizeof(buf.f_fsid));
+	*namelen_out = buf.f_namelen;
+	spare_out[0] = buf.f_spare[0];
+	spare_out[1] = buf.f_spare[1];
+	spare_out[2] = buf.f_spare[2];
+	spare_out[3] = buf.f_spare[3];
+	spare_out[4] = buf.f_spare[4];
+	spare_out[5] = buf.f_spare[5];
+	return(0);
+}
+
 /*
  * Overrides for Emacs so that we follow Linus's tabbing style.
  * Emacs will notice this stuff at the end of the file and automatically
Index: um/fs/hostfs/Makefile
===================================================================
--- um.orig/fs/hostfs/Makefile	2004-08-10 15:06:41.000000000 -0400
+++ um/fs/hostfs/Makefile	2004-08-12 17:02:13.000000000 -0400
@@ -5,6 +5,7 @@
 
 obj-y = 
 obj-$(CONFIG_EXTERNFS) += externfs.o
+obj-$(CONFIG_HOSTFS) += host_fs.o host_file.o
 
 SINGLE_OBJS = $(foreach f,$(patsubst %.o,%,$(obj-y) $(obj-m)),$($(f)-objs))
 
Index: um/fs/hostfs/host_file.c
===================================================================
--- um.orig/fs/hostfs/host_file.c	2003-09-15 09:40:47.000000000 -0400
+++ um/fs/hostfs/host_file.c	2004-08-10 15:23:43.000000000 -0400
@@ -0,0 +1,442 @@
+/* 
+ * Copyright (C) 2004 Jeff Dike (jdike@addtoit.com)
+ * Licensed under the GPL
+ */
+
+#include "linux/stddef.h"
+#include "linux/string.h"
+#include "linux/errno.h"
+#include "linux/types.h"
+#include "linux/slab.h"
+#include "linux/fs.h"
+#include "asm/fcntl.h"
+#include "hostfs.h"
+#include "filehandle.h"
+
+extern int append;
+
+char *get_path(const char *path[], char *buf, int size)
+{
+	const char **s;
+	char *p;
+	int new = 1;
+
+	for(s = path; *s != NULL; s++){
+		new += strlen(*s);
+		if((*(s + 1) != NULL) && (strlen(*s) > 0) && 
+		   ((*s)[strlen(*s) - 1] != '/'))
+			new++;
+	}
+
+	if(new > size){
+		buf = kmalloc(new, GFP_KERNEL);
+		if(buf == NULL)
+			return(NULL);
+	}
+
+	p = buf;
+	for(s = path; *s != NULL; s++){
+		strcpy(p, *s);
+		p += strlen(*s);
+		if((*(s + 1) != NULL) && (strlen(*s) > 0) && 
+		   ((*s)[strlen(*s) - 1] != '/'))
+			strcpy(p++, "/");
+	}
+		
+	return(buf);
+}
+
+void free_path(const char *buf, char *tmp)
+{
+	if((buf != tmp) && (buf != NULL))
+		kfree((char *) buf);
+}
+
+int host_open_file(const char *path[], int r, int w, struct file_handle *fh)
+{
+	char tmp[HOSTFS_BUFSIZE], *file;
+	int mode = 0, err;
+	struct openflags flags = OPENFLAGS();
+
+	if (r)
+		flags = of_read(flags);
+	if (w)
+		flags = of_write(flags);
+	if(append)
+		flags = of_append(flags);
+
+	err = -ENOMEM;
+	file = get_path(path, tmp, sizeof(tmp));
+	if(file == NULL)
+		goto out;
+	
+	err = open_filehandle(file, flags, mode, fh);
+ out:
+	free_path(file, tmp);
+	return(err);
+}
+
+void *host_open_dir(const char *path[])
+{
+	char tmp[HOSTFS_BUFSIZE], *file;
+	void *dir = ERR_PTR(-ENOMEM);
+
+	file = get_path(path, tmp, sizeof(tmp));
+	if(file == NULL)
+		goto out;
+	
+	dir = open_dir(file);
+ out:
+	free_path(file, tmp);
+	return(dir);
+}
+
+char *host_read_dir(void *stream, unsigned long long *pos, 
+		    unsigned long long *ino_out, int *len_out)
+{
+	int err;
+	char *name;
+
+	err = os_seek_dir(stream, *pos);
+	if(err)
+		return(ERR_PTR(err));
+
+	err = os_read_dir(stream, ino_out, &name);
+	if(err)
+		return(ERR_PTR(err));
+
+	if(name == NULL)
+		return(NULL);
+
+	*len_out = strlen(name);
+	*pos = os_tell_dir(stream);
+	return(name);
+}
+
+int host_file_type(const char *path[], int *rdev)
+{
+	char tmp[HOSTFS_BUFSIZE], *file;
+ 	struct uml_stat buf;
+	int ret;
+
+	ret = -ENOMEM;
+	file = get_path(path, tmp, sizeof(tmp));
+	if(file == NULL)
+		goto out;
+
+	if(rdev != NULL){
+		ret = os_lstat_file(file, &buf);
+		if(ret)
+			goto out;
+		*rdev = MKDEV(buf.ust_rmajor, buf.ust_rminor);
+	}
+
+	ret = os_file_type(file);
+ out:
+	free_path(file, tmp);
+	return(ret);
+}
+
+int host_create_file(const char *path[], int mode, struct file_handle *fh)
+{
+	char tmp[HOSTFS_BUFSIZE], *file;
+	int err = -ENOMEM;
+
+	file = get_path(path, tmp, sizeof(tmp));
+	if(file == NULL)
+		goto out;
+
+	err = open_filehandle(file, of_create(of_rdwr(OPENFLAGS())), mode, fh);
+ out:
+	free_path(file, tmp);
+	return(err);
+}
+
+static int do_stat_file(const char *path, int *dev_out, 
+			unsigned long long *inode_out, int *mode_out, 
+			int *nlink_out, int *uid_out, int *gid_out, 
+			unsigned long long *size_out, unsigned long *atime_out,
+			unsigned long *mtime_out, unsigned long *ctime_out,
+			int *blksize_out, unsigned long long *blocks_out)
+{
+	struct uml_stat buf;
+	int err;
+
+	err = os_lstat_file(path, &buf);
+	if(err < 0)
+		return(err);
+
+	if(dev_out != NULL) *dev_out = MKDEV(buf.ust_major, buf.ust_minor);
+	if(inode_out != NULL) *inode_out = buf.ust_ino;
+	if(mode_out != NULL) *mode_out = buf.ust_mode;
+	if(nlink_out != NULL) *nlink_out = buf.ust_nlink;
+	if(uid_out != NULL) *uid_out = buf.ust_uid;
+	if(gid_out != NULL) *gid_out = buf.ust_gid;
+	if(size_out != NULL) *size_out = buf.ust_size;
+	if(atime_out != NULL) *atime_out = buf.ust_atime;
+	if(mtime_out != NULL) *mtime_out = buf.ust_mtime;
+	if(ctime_out != NULL) *ctime_out = buf.ust_ctime;
+	if(blksize_out != NULL) *blksize_out = buf.ust_blksize;
+	if(blocks_out != NULL) *blocks_out = buf.ust_blocks;
+
+	return(0);
+}
+
+int host_stat_file(const char *path[], int *dev_out,
+		   unsigned long long *inode_out, int *mode_out, 
+		   int *nlink_out, int *uid_out, int *gid_out, 
+		   unsigned long long *size_out, unsigned long *atime_out,
+		   unsigned long *mtime_out, unsigned long *ctime_out,
+		   int *blksize_out, unsigned long long *blocks_out)
+{
+	char tmp[HOSTFS_BUFSIZE], *file;
+	int err;
+
+	err = -ENOMEM;
+	file = get_path(path, tmp, sizeof(tmp));
+	if(file == NULL)
+		goto out;
+
+	err = do_stat_file(file, dev_out, inode_out, mode_out, nlink_out, 
+			   uid_out, gid_out, size_out, atime_out, mtime_out,
+			   ctime_out, blksize_out, blocks_out);
+ out:
+	free_path(file, tmp);
+	return(err);
+}
+
+int host_set_attr(const char *path[], struct externfs_iattr *attrs)
+{
+	char tmp[HOSTFS_BUFSIZE], *file;
+	unsigned long time;
+	int err = 0, ma;
+
+	if(append && (attrs->ia_valid & EXTERNFS_ATTR_SIZE))
+		return(-EPERM);
+
+	err = -ENOMEM;
+	file = get_path(path, tmp, sizeof(tmp));
+	if(file == NULL)
+		goto out;
+
+	if(attrs->ia_valid & EXTERNFS_ATTR_MODE){
+		err = os_set_file_perms(file, attrs->ia_mode);
+		if(err < 0)
+			goto out;
+	}
+	if(attrs->ia_valid & EXTERNFS_ATTR_UID){
+		err = os_set_file_owner(file, attrs->ia_uid, -1);
+		if(err < 0)
+			goto out;
+	}
+	if(attrs->ia_valid & EXTERNFS_ATTR_GID){
+		err = os_set_file_owner(file, -1, attrs->ia_gid);
+		if(err < 0)
+			goto out;
+	}
+	if(attrs->ia_valid & EXTERNFS_ATTR_SIZE){
+		err = os_truncate_file(file, attrs->ia_size);
+		if(err < 0)
+			goto out;
+	}
+	ma = EXTERNFS_ATTR_ATIME_SET | EXTERNFS_ATTR_MTIME_SET;
+	if((attrs->ia_valid & ma) == ma){
+		err = os_set_file_time(file, attrs->ia_atime, attrs->ia_mtime);
+		if(err)
+			goto out;
+	}
+	else {
+		if(attrs->ia_valid & EXTERNFS_ATTR_ATIME_SET){
+			err = do_stat_file(file, NULL, NULL, NULL, NULL, NULL, 
+					   NULL, NULL, NULL, &time, 
+					   NULL, NULL, NULL);
+			if(err != 0)
+				goto out;
+
+			err = os_set_file_time(file, attrs->ia_atime, time);
+			if(err)
+				goto out;
+		}
+		if(attrs->ia_valid & EXTERNFS_ATTR_MTIME_SET){
+			err = do_stat_file(file, NULL, NULL, NULL, NULL, NULL, 
+					   NULL, NULL, &time, NULL, 
+					   NULL, NULL, NULL);
+			if(err != 0)
+				goto out;
+
+			err = os_set_file_time(file, time, attrs->ia_mtime);
+			if(err)
+				goto out;
+		}
+	}
+	if(attrs->ia_valid & EXTERNFS_ATTR_CTIME) ;
+	if(attrs->ia_valid & (EXTERNFS_ATTR_ATIME | EXTERNFS_ATTR_MTIME)){
+		err = do_stat_file(file, NULL, NULL, NULL, NULL, NULL, 
+				   NULL, NULL, &attrs->ia_atime, 
+				   &attrs->ia_mtime, NULL, NULL, NULL);
+		if(err != 0)
+			goto out;
+	}
+
+	err = 0;
+ out:
+	free_path(file, tmp);
+	return(err);
+}
+
+int host_make_symlink(const char *from[], const char *to)
+{
+	char tmp[HOSTFS_BUFSIZE], *file;
+	int err = -ENOMEM;
+
+	file = get_path(from, tmp, sizeof(tmp));
+	if(file == NULL)
+		goto out;
+	
+	err = os_make_symlink(to, file);
+ out:
+	free_path(file, tmp);
+	return(err);
+}
+
+int host_unlink_file(const char *path[])
+{
+	char tmp[HOSTFS_BUFSIZE], *file;
+	int err = -ENOMEM;
+
+	if(append)
+		return(-EPERM);
+
+	file = get_path(path, tmp, sizeof(tmp));
+	if(file == NULL)
+		goto out;
+
+	err = os_remove_file(file);
+ out:
+	free_path(file, tmp);
+	return(err);
+}
+
+int host_make_dir(const char *path[], int mode)
+{
+	char tmp[HOSTFS_BUFSIZE], *file;
+	int err = -ENOMEM;
+
+	file = get_path(path, tmp, sizeof(tmp));
+	if(file == NULL)
+		goto out;
+
+	err = os_make_dir(file, mode);
+ out:
+	free_path(file, tmp);
+	return(err);
+}
+
+int host_remove_dir(const char *path[])
+{
+	char tmp[HOSTFS_BUFSIZE], *file;
+	int err = -ENOMEM;
+
+	file = get_path(path, tmp, sizeof(tmp));
+	if(file == NULL)
+		goto out;
+
+	err = os_remove_dir(file);
+ out:
+	free_path(file, tmp);
+	return(err);
+}
+
+int host_link_file(const char *to[], const char *from[])
+{
+	char from_tmp[HOSTFS_BUFSIZE], *f, to_tmp[HOSTFS_BUFSIZE], *t;
+	int err = -ENOMEM;
+
+	f = get_path(from, from_tmp, sizeof(from_tmp));
+	t = get_path(to, to_tmp, sizeof(to_tmp));
+	if((f == NULL) || (t == NULL))
+		goto out;
+
+	err = os_link_file(t, f);
+ out:
+	free_path(f, from_tmp);
+	free_path(t, to_tmp);
+	return(err);
+}
+
+int host_read_link(const char *path[], char *buf, int size)
+{
+	char tmp[HOSTFS_BUFSIZE], *file;
+	int n = -ENOMEM;
+
+	file = get_path(path, tmp, sizeof(tmp));
+	if(file == NULL)
+		goto out;
+
+	n = os_read_symlink(file, buf, size);
+	if(n < size) 
+		buf[n] = '\0';
+ out:
+	free_path(file, tmp);
+	return(n);
+}
+
+int host_rename_file(const char *from[], const char *to[])
+{
+	char from_tmp[HOSTFS_BUFSIZE], *f, to_tmp[HOSTFS_BUFSIZE], *t;
+	int err = -ENOMEM;
+
+	f = get_path(from, from_tmp, sizeof(from_tmp));
+	t = get_path(to, to_tmp, sizeof(to_tmp));
+	if((f == NULL) || (t == NULL))
+		goto out;
+
+	err = os_move_file(f, t);
+ out:
+	free_path(f, from_tmp);
+	free_path(t, to_tmp);
+	return(err);
+}
+
+int host_stat_fs(const char *path[], long *bsize_out, long long *blocks_out, 
+		 long long *bfree_out, long long *bavail_out, 
+		 long long *files_out, long long *ffree_out, void *fsid_out, 
+		 int fsid_size, long *namelen_out, long *spare_out)
+{
+	char tmp[HOSTFS_BUFSIZE], *file;
+	int err = -ENOMEM;
+
+	file = get_path(path, tmp, sizeof(tmp));
+	if(file == NULL)
+		goto out;
+
+	err = os_stat_filesystem(file, bsize_out, blocks_out, bfree_out, 
+				 bavail_out, files_out, ffree_out, fsid_out, 
+				 fsid_size, namelen_out, spare_out);
+ out:
+	free_path(file, tmp);
+	return(err);
+}
+
+char *generic_host_read_dir(void *stream, unsigned long long *pos, 
+			    unsigned long long *ino_out, int *len_out, 
+			    void *mount)
+{
+	return(host_read_dir(stream, pos, ino_out, len_out));
+}
+
+int generic_host_truncate_file(struct file_handle *fh, __u64 size, void *m)
+{
+	return(truncate_file(fh, size));
+}
+
+/*
+ * Overrides for Emacs so that we follow Linus's tabbing style.
+ * Emacs will notice this stuff at the end of the file and automatically
+ * adjust the settings for this buffer only.  This must remain at the end
+ * of the file.
+ * ---------------------------------------------------------------------------
+ * Local variables:
+ * c-file-style: "linux"
+ * End:
+ */
Index: um/fs/hostfs/host_fs.c
===================================================================
--- um.orig/fs/hostfs/host_fs.c	2003-09-15 09:40:47.000000000 -0400
+++ um/fs/hostfs/host_fs.c	2004-08-12 17:02:53.000000000 -0400
@@ -0,0 +1,467 @@
+/* 
+ * Copyright (C) 2000 - 2004 Jeff Dike (jdike@addtoit.com)
+ * Licensed under the GPL
+ */
+
+#include "linux/stddef.h"
+#include "linux/string.h"
+#include "linux/types.h"
+#include "linux/errno.h"
+#include "linux/slab.h"
+#include "linux/init.h"
+#include "linux/fs.h"
+#include "linux/stat.h"
+#include "hostfs.h"
+#include "kern.h"
+#include "init.h"
+#include "kern_util.h"
+#include "filehandle.h"
+#include "os.h"
+
+/* Changed in hostfs_args before the kernel starts running */
+static char *jail_dir = "/";
+int append = 0;
+
+static int __init hostfs_args(char *options, int *add)
+{
+	char *ptr;
+
+	ptr = strchr(options, ',');
+	if(ptr != NULL)
+		*ptr++ = '\0';
+	if(*options != '\0')
+		jail_dir = options;
+
+	options = ptr;
+	while(options){
+		ptr = strchr(options, ',');
+		if(ptr != NULL)
+			*ptr++ = '\0';
+		if(*options != '\0'){
+			if(!strcmp(options, "append"))
+				append = 1;
+			else printf("hostfs_args - unsupported option - %s\n",
+				    options);
+		}
+		options = ptr;
+	}
+	return(0);
+}
+
+__uml_setup("hostfs=", hostfs_args,
+"hostfs=<root dir>,<flags>,...\n"
+"    This is used to set hostfs parameters.  The root directory argument\n"
+"    is used to confine all hostfs mounts to within the specified directory\n"
+"    tree on the host.  If this isn't specified, then a user inside UML can\n"
+"    mount anything on the host that's accessible to the user that's running\n"
+"    it.\n"
+"    The only flag currently supported is 'append', which specifies that all\n"
+"    files opened by hostfs will be opened in append mode.\n\n"
+);
+
+struct hostfs_data {
+	struct externfs_data ext;
+	char *mount;
+};
+
+struct hostfs_file {
+	struct externfs_inode ext;
+	struct file_handle fh;
+};
+
+static int hostfs_access_file(char *file, int uid, int w, int x, int gid, 
+			      int r, struct externfs_data *ed)
+{
+	char *mount = container_of(ed, struct hostfs_data, ext)->mount;
+	const char *path[] = { jail_dir, mount, file, NULL };
+	char tmp[HOSTFS_BUFSIZE];
+	int err, mode = 0;
+
+	if(r) mode = OS_ACC_R_OK;
+	if(w) mode |= OS_ACC_W_OK;
+	if(x) mode |= OS_ACC_X_OK;
+	
+	err = -ENOMEM;
+	file = get_path(path, tmp, sizeof(tmp));
+	if(file == NULL)
+		goto out;
+
+	err = os_access(file, mode);
+	free_path(file, tmp);
+ out:
+	return(err);
+}
+
+static int hostfs_make_node(const char *file, int mode, int uid, int gid, 
+			    int type, int major, int minor, 
+			    struct externfs_data *ed)
+{
+	char *mount = container_of(ed, struct hostfs_data, ext)->mount;
+	const char *path[] = { jail_dir, mount, file, NULL };
+	char tmp[HOSTFS_BUFSIZE];
+	int err = -ENOMEM;
+
+	file = get_path(path, tmp, sizeof(tmp));
+	if(file == NULL)
+		goto out;
+
+	/* XXX Pass type in an OS-independent way */
+	mode |= type;
+
+	err = os_make_dev(file, mode, major, minor);
+	free_path(file, tmp);
+ out:
+	return(err);
+}
+
+static int hostfs_stat_file(const char *file, struct externfs_data *ed, 
+			    dev_t *dev_out, unsigned long long *inode_out, 
+			    int *mode_out, int *nlink_out, int *uid_out, 
+			    int *gid_out, unsigned long long *size_out, 
+			    unsigned long *atime_out, unsigned long *mtime_out,
+			    unsigned long *ctime_out, int *blksize_out, 
+			    unsigned long long *blocks_out)
+{
+	char *mount = container_of(ed, struct hostfs_data, ext)->mount;
+	const char *path[] = { jail_dir, mount, file, NULL };
+
+	/* XXX Why pretend everything is owned by root? */
+	*uid_out = 0;
+	*gid_out = 0;
+	return(host_stat_file(path, dev_out, inode_out, mode_out, nlink_out,
+			      NULL, NULL, size_out, atime_out, mtime_out,
+			      ctime_out, blksize_out, blocks_out));
+}
+
+static int hostfs_file_type(const char *file, int *rdev, 
+			    struct externfs_data *ed)
+{
+	char *mount = container_of(ed, struct hostfs_data, ext)->mount;
+	const char *path[] = { jail_dir, mount, file, NULL };
+
+	return(host_file_type(path, rdev));
+}
+
+static char *hostfs_name(struct inode *inode)
+{
+	struct externfs_data *ed = inode_externfs_info(inode);
+	char *mount = container_of(ed, struct hostfs_data, ext)->mount;
+
+	return(inode_name_prefix(inode, mount));	
+}
+
+static struct externfs_inode *hostfs_init_file(struct externfs_data *ed)
+{
+	struct hostfs_file *hf;
+
+	hf = kmalloc(sizeof(*hf), GFP_KERNEL);
+	if(hf == NULL)
+		return(NULL);
+
+	hf->fh.fd = -1;
+	return(&hf->ext);
+}
+
+static int hostfs_open_file(struct externfs_inode *ext, char *file, 
+			    int uid, int gid, struct inode *inode, 
+			    struct externfs_data *ed)
+{
+	struct hostfs_file *hf = container_of(ext, struct hostfs_file, ext);
+	char *mount = container_of(ed, struct hostfs_data, ext)->mount;
+	const char *path[] = { jail_dir, mount, file, NULL };
+	int err;
+
+	err = host_open_file(path, 1, 1, &hf->fh);
+	if(err == -EISDIR)
+		goto out;
+
+	if(err == -EACCES)
+		err = host_open_file(path, 1, 0, &hf->fh);
+
+	if(err)
+		goto out;
+
+	is_reclaimable(&hf->fh, hostfs_name, inode);
+ out:
+	return(err);
+}
+
+static void *hostfs_open_dir(char *file, int uid, int gid, 
+			     struct externfs_data *ed)
+{
+	char *mount = container_of(ed, struct hostfs_data, ext)->mount;
+	const char *path[] = { jail_dir, mount, file, NULL };
+
+	return(host_open_dir(path));
+}
+
+static void hostfs_close_dir(void *stream, struct externfs_data *ed)
+{
+	os_close_dir(stream);
+}
+
+static char *hostfs_read_dir(void *stream, unsigned long long *pos, 
+			     unsigned long long *ino_out, int *len_out, 
+			     struct externfs_data *ed)
+{
+	char *mount = container_of(ed, struct hostfs_data, ext)->mount;
+
+	return(generic_host_read_dir(stream, pos, ino_out, len_out, mount));
+}
+
+static int hostfs_read_file(struct externfs_inode *ext, 
+			    unsigned long long offset, char *buf, int len, 
+			    int ignore_start, int ignore_end,
+			    void (*completion)(char *, int, void *), void *arg,
+			    struct externfs_data *ed)
+{
+	struct hostfs_file *hf = container_of(ext, struct hostfs_file, ext);
+	int err = 0;
+
+	if(ignore_start != 0){
+		err = read_file(&hf->fh, offset, buf, ignore_start);
+		if(err < 0)
+			goto out;
+	}
+
+	if(ignore_end != len)
+		err = read_file(&hf->fh, offset + ignore_end, buf + ignore_end,
+				len - ignore_end);
+
+ out:
+
+	(*completion)(buf, err, arg);
+	if (err > 0)
+		err = 0;
+	return(err);
+}
+
+static int hostfs_write_file(struct externfs_inode *ext,
+			     unsigned long long offset, const char *buf, 
+			     int start, int len, 
+			     void (*completion)(char *, int, void *), 
+			     void *arg, struct externfs_data *ed)
+{
+	struct file_handle *fh;
+	int err;
+
+	fh = &container_of(ext, struct hostfs_file, ext)->fh;
+	err = write_file(fh, offset + start, buf + start, len);
+
+	(*completion)((char *) buf, err, arg);
+	if (err > 0)
+		err = 0;
+
+	return(err);
+}
+
+static int hostfs_create_file(struct externfs_inode *ext, char *file, int mode,
+			      int uid, int gid, struct inode *inode, 
+			      struct externfs_data *ed)
+{
+	struct hostfs_file *hf = container_of(ext, struct hostfs_file, 
+					      ext);
+	char *mount = container_of(ed, struct hostfs_data, ext)->mount;
+	const char *path[] = { jail_dir, mount, file, NULL };
+	int err = -ENOMEM;
+	
+	err = host_create_file(path, mode, &hf->fh);
+	if(err)
+		goto out;
+
+	is_reclaimable(&hf->fh, hostfs_name, inode);
+ out:
+	return(err);
+}
+
+static int hostfs_set_attr(const char *file, struct externfs_iattr *attrs, 
+			   struct externfs_data *ed)
+{
+	char *mount = container_of(ed, struct hostfs_data, ext)->mount;
+	const char *path[] = { jail_dir, mount, file, NULL };
+
+	return(host_set_attr(path, attrs));
+}
+
+static int hostfs_make_symlink(const char *from, const char *to, int uid, 
+			       int gid, struct externfs_data *ed)
+{
+	char *mount = container_of(ed, struct hostfs_data, ext)->mount;
+	const char *path[] = { jail_dir, mount, from, NULL };
+
+	return(host_make_symlink(path, to));
+}
+
+static int hostfs_link_file(const char *to, const char *from, int uid, int gid,
+			    struct externfs_data *ed)
+{
+	char *mount = container_of(ed, struct hostfs_data, ext)->mount;
+	const char *to_path[] = { jail_dir, mount, to, NULL };
+	const char *from_path[] = { jail_dir, mount, from, NULL };
+
+	return(host_link_file(to_path, from_path));
+}
+
+static int hostfs_unlink_file(const char *file, struct externfs_data *ed)
+{
+	char *mount = container_of(ed, struct hostfs_data, ext)->mount;
+	const char *path[] = { jail_dir, mount, file, NULL };
+
+	return(host_unlink_file(path));
+}
+
+static int hostfs_make_dir(const char *file, int mode, int uid, int gid, 
+			   struct externfs_data *ed)
+{
+	char *mount = container_of(ed, struct hostfs_data, ext)->mount;
+	const char *path[] = { jail_dir, mount, file, NULL };
+
+	return(host_make_dir(path, mode));
+}
+
+static int hostfs_remove_dir(const char *file, int uid, int gid, 
+			     struct externfs_data *ed)
+{
+	char *mount = container_of(ed, struct hostfs_data, ext)->mount;
+	const char *path[] = { jail_dir, mount, file, NULL };
+
+	return(host_remove_dir(path));
+}
+
+static int hostfs_read_link(char *file, int uid, int gid, char *buf, int size, 
+			    struct externfs_data *ed)
+{
+	char *mount = container_of(ed, struct hostfs_data, ext)->mount;
+	const char *path[] = { jail_dir, mount, file, NULL };
+
+	return(host_read_link(path, buf, size));
+}
+
+static int hostfs_rename_file(char *from, char *to, struct externfs_data *ed)
+{
+	char *mount = container_of(ed, struct hostfs_data, ext)->mount;
+	const char *to_path[] = { jail_dir, mount, to, NULL };
+	const char *from_path[] = { jail_dir, mount, from, NULL };
+
+	return(host_rename_file(from_path, to_path));
+}
+
+static int hostfs_stat_fs(long *bsize_out, long long *blocks_out, 
+			  long long *bfree_out, long long *bavail_out, 
+			  long long *files_out, long long *ffree_out,
+			  void *fsid_out, int fsid_size, long *namelen_out, 
+			  long *spare_out, struct externfs_data *ed)
+{
+	char *mount = container_of(ed, struct hostfs_data, ext)->mount;
+	const char *path[] = { jail_dir, mount, NULL };
+
+	return(host_stat_fs(path, bsize_out, blocks_out, bfree_out, bavail_out,
+			    files_out, ffree_out, fsid_out, fsid_size, 
+			    namelen_out, spare_out));
+}
+
+void hostfs_close_file(struct externfs_inode *ext,
+		       unsigned long long size)
+{
+	struct hostfs_file *hf = container_of(ext, struct hostfs_file, ext);
+
+	if(hf->fh.fd != -1){
+		truncate_file(&hf->fh, size);
+		close_file(&hf->fh);
+	}
+
+	kfree(hf);
+}
+
+int hostfs_truncate_file(struct externfs_inode *ext, __u64 size, 
+			 struct externfs_data *ed)
+{
+	struct hostfs_file *hf = container_of(ext, struct hostfs_file, ext);
+
+	return(truncate_file(&hf->fh, size));
+}
+
+static struct externfs_file_ops hostfs_file_ops = {
+	.stat_file		= hostfs_stat_file,
+	.file_type		= hostfs_file_type,
+	.access_file		= hostfs_access_file,
+	.open_file		= hostfs_open_file,
+	.open_dir		= hostfs_open_dir,
+	.read_dir		= hostfs_read_dir,
+	.read_file		= hostfs_read_file,
+	.write_file		= hostfs_write_file,
+	.map_file_page		= NULL,
+	.close_file		= hostfs_close_file,
+	.close_dir		= hostfs_close_dir,
+	.invisible		= NULL,
+	.create_file		= hostfs_create_file,
+	.set_attr		= hostfs_set_attr,
+	.make_symlink		= hostfs_make_symlink,
+	.unlink_file		= hostfs_unlink_file,
+	.make_dir		= hostfs_make_dir,
+	.remove_dir		= hostfs_remove_dir,
+	.make_node		= hostfs_make_node,
+	.link_file		= hostfs_link_file,
+	.read_link		= hostfs_read_link,
+	.rename_file		= hostfs_rename_file,
+	.statfs			= hostfs_stat_fs,
+	.truncate_file		= hostfs_truncate_file
+};
+
+static struct externfs_data *mount_fs(char *mount_arg)
+{
+	struct hostfs_data *hd;
+	int err = -ENOMEM;
+
+	hd = kmalloc(sizeof(*hd), GFP_KERNEL);
+	if(hd == NULL)
+		goto out;
+
+	hd->mount = host_root_filename(mount_arg);
+	if(hd->mount == NULL)
+		goto out_free;
+
+	init_externfs(&hd->ext, &hostfs_file_ops);
+
+	return(&hd->ext);
+
+ out_free:
+	kfree(hd);
+ out:
+	return(ERR_PTR(err));
+}
+
+static struct externfs_mount_ops hostfs_mount_ops = {
+	.init_file		= hostfs_init_file,
+	.mount			= mount_fs,
+};
+
+static int __init init_hostfs(void)
+{
+	return(register_externfs("hostfs", &hostfs_mount_ops));
+}
+
+static void __exit exit_hostfs(void)
+{
+	unregister_externfs("hostfs");
+}
+
+__initcall(init_hostfs);
+__exitcall(exit_hostfs);
+
+#if 0
+module_init(init_hostfs)
+module_exit(exit_hostfs)
+MODULE_LICENSE("GPL");
+#endif
+
+/*
+ * Overrides for Emacs so that we follow Linus's tabbing style.
+ * Emacs will notice this stuff at the end of the file and automatically
+ * adjust the settings for this buffer only.  This must remain at the end
+ * of the file.
+ * ---------------------------------------------------------------------------
+ * Local variables:
+ * c-file-style: "linux"
+ * End:
+ */
Index: um/fs/hostfs/hostfs_kern.c
===================================================================
--- um.orig/fs/hostfs/hostfs_kern.c	2004-08-10 15:06:41.000000000 -0400
+++ um/fs/hostfs/hostfs_kern.c	2003-09-15 09:40:47.000000000 -0400
@@ -1,1008 +0,0 @@
-/* 
- * Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com)
- * Licensed under the GPL
- *
- * Ported the filesystem routines to 2.5.
- * 2003-02-10 Petr Baudis <pasky@ucw.cz>
- */
-
-#include <linux/stddef.h>
-#include <linux/fs.h>
-#include <linux/version.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/slab.h>
-#include <linux/pagemap.h>
-#include <linux/blkdev.h>
-#include <linux/list.h>
-#include <linux/buffer_head.h>
-#include <linux/root_dev.h>
-#include <linux/statfs.h>
-#include <asm/uaccess.h>
-#include "hostfs.h"
-#include "kern_util.h"
-#include "kern.h"
-#include "user_util.h"
-#include "2_5compat.h"
-#include "init.h"
-
-struct hostfs_inode_info {
-	char *host_filename;
-	int fd;
-	int mode;
-	struct inode vfs_inode;
-};
-
-static inline struct hostfs_inode_info *HOSTFS_I(struct inode *inode)
-{
-	return(list_entry(inode, struct hostfs_inode_info, vfs_inode));
-}
-
-#define FILE_HOSTFS_I(file) HOSTFS_I((file)->f_dentry->d_inode)
-
-int hostfs_d_delete(struct dentry *dentry)
-{
-	return(1);
-}
-
-struct dentry_operations hostfs_dentry_ops = {
-	.d_delete		= hostfs_d_delete,
-};
-
-/* Changed in hostfs_args before the kernel starts running */
-static char *root_ino = "/";
-static int append = 0;
-
-#define HOSTFS_SUPER_MAGIC 0x00c0ffee
-
-static struct inode_operations hostfs_iops;
-static struct inode_operations hostfs_dir_iops;
-static struct address_space_operations hostfs_link_aops;
-
-static int __init hostfs_args(char *options, int *add)
-{
-	char *ptr;
-
-	ptr = strchr(options, ',');
-	if(ptr != NULL)
-		*ptr++ = '\0';
-	if(*options != '\0')
-		root_ino = options;
-
-	options = ptr;
-	while(options){
-		ptr = strchr(options, ',');
-		if(ptr != NULL)
-			*ptr++ = '\0';
-		if(*options != '\0'){
-			if(!strcmp(options, "append"))
-				append = 1;
-			else printf("hostfs_args - unsupported option - %s\n",
-				    options);
-		}
-		options = ptr;
-	}
-	return(0);
-}
-
-__uml_setup("hostfs=", hostfs_args,
-"hostfs=<root dir>,<flags>,...\n"
-"    This is used to set hostfs parameters.  The root directory argument\n"
-"    is used to confine all hostfs mounts to within the specified directory\n"
-"    tree on the host.  If this isn't specified, then a user inside UML can\n"
-"    mount anything on the host that's accessible to the user that's running\n"
-"    it.\n"
-"    The only flag currently supported is 'append', which specifies that all\n"
-"    files opened by hostfs will be opened in append mode.\n\n"
-);
-
-static char *dentry_name(struct dentry *dentry, int extra)
-{
-	struct dentry *parent;
-	char *root, *name;
-	int len;
-
-	len = 0;
-	parent = dentry;
-	while(parent->d_parent != parent){
-		len += parent->d_name.len + 1;
-		parent = parent->d_parent;
-	}
-	
-	root = HOSTFS_I(parent->d_inode)->host_filename;
-	len += strlen(root);
-	name = kmalloc(len + extra + 1, GFP_KERNEL);
-	if(name == NULL) return(NULL);
-
-	name[len] = '\0';
-	parent = dentry;
-	while(parent->d_parent != parent){
-		len -= parent->d_name.len + 1;
-		name[len] = '/';
-		strncpy(&name[len + 1], parent->d_name.name, 
-			parent->d_name.len);
-		parent = parent->d_parent;
-	}
-	strncpy(name, root, strlen(root));
-	return(name);
-}
-
-static char *inode_name(struct inode *ino, int extra)
-{
-	struct dentry *dentry;
-
-	dentry = list_entry(ino->i_dentry.next, struct dentry, d_alias);
-	return(dentry_name(dentry, extra));
-}
-
-static int read_name(struct inode *ino, char *name)
-{
-	/* The non-int inode fields are copied into ints by stat_file and
-	 * then copied into the inode because passing the actual pointers
-	 * in and having them treated as int * breaks on big-endian machines
-	 */
-	int err;
-	int i_mode, i_nlink, i_blksize;
-	unsigned long long i_size;
-	unsigned long long i_ino;
-	unsigned long long i_blocks;
-
-	err = stat_file(name, &i_ino, &i_mode, &i_nlink, &ino->i_uid, 
-			&ino->i_gid, &i_size, &ino->i_atime, &ino->i_mtime, 
-			&ino->i_ctime, &i_blksize, &i_blocks);
-	if(err) 
-		return(err);
-
-	ino->i_ino = i_ino;
-	ino->i_mode = i_mode;
-	ino->i_nlink = i_nlink;
-	ino->i_size = i_size;
-	ino->i_blksize = i_blksize;
-	ino->i_blocks = i_blocks;
-	if((ino->i_sb->s_dev == ROOT_DEV) && (ino->i_uid == getuid()))
-		ino->i_uid = 0;
-	return(0);
-}
-
-static char *follow_link(char *link)
-{
-	int len, n;
-	char *name, *resolved, *end;
-
-	len = 64;
-	while(1){
-		n = -ENOMEM;
-		name = kmalloc(len, GFP_KERNEL);
-		if(name == NULL)
-			goto out;
-
-		n = do_readlink(link, name, len);
-		if(n < len)
-			break;
-		len *= 2;
-		kfree(name);
-	}
-	if(n < 0)
-		goto out_free;
-
-	if(*name == '/')
-		return(name);
-
-	end = strrchr(link, '/');
-	if(end == NULL)
-		return(name);
-
-	*(end + 1) = '\0';
-	len = strlen(link) + strlen(name) + 1;
-
-	resolved = kmalloc(len, GFP_KERNEL);
-	if(resolved == NULL){
-		n = -ENOMEM;
-		goto out_free;
-	}
-
-	sprintf(resolved, "%s%s", link, name);
-	kfree(name);
-	kfree(link);
-	return(resolved);
-
- out_free:
-	kfree(name);
- out:
-	return(ERR_PTR(n));
-}
-
-static int read_inode(struct inode *ino)
-{
-	char *name;
-	int err = 0;
-
-	/* Unfortunately, we are called from iget() when we don't have a dentry
-	 * allocated yet.
-	 */
-	if(list_empty(&ino->i_dentry))
-		goto out;
- 
-	err = -ENOMEM;
-	name = inode_name(ino, 0);
-	if(name == NULL) 
-		goto out;
-
-	if(file_type(name, NULL) == OS_TYPE_SYMLINK){
-		name = follow_link(name);
-		if(IS_ERR(name)){
-			err = PTR_ERR(name);
-			goto out;
-		}
-	}
-	
-	err = read_name(ino, name);
-	kfree(name);
- out:
-	return(err);
-}
-
-int hostfs_statfs(struct super_block *sb, struct kstatfs *sf)
-{
-	/* do_statfs uses struct statfs64 internally, but the linux kernel
-	 * struct statfs still has 32-bit versions for most of these fields,
-	 * so we convert them here
-	 */
-	int err;
-	long long f_blocks;
-	long long f_bfree;
-	long long f_bavail;
-	long long f_files;
-	long long f_ffree;
-
-	err = do_statfs(HOSTFS_I(sb->s_root->d_inode)->host_filename,
-			&sf->f_bsize, &f_blocks, &f_bfree, &f_bavail, &f_files,
-			&f_ffree, &sf->f_fsid, sizeof(sf->f_fsid), 
-			&sf->f_namelen, sf->f_spare);
-	if(err) return(err);
-	sf->f_blocks = f_blocks;
-	sf->f_bfree = f_bfree;
-	sf->f_bavail = f_bavail;
-	sf->f_files = f_files;
-	sf->f_ffree = f_ffree;
-	sf->f_type = HOSTFS_SUPER_MAGIC;
-	return(0);
-}
-
-static struct inode *hostfs_alloc_inode(struct super_block *sb)
-{
-	struct hostfs_inode_info *hi;
-
-	hi = kmalloc(sizeof(*hi), GFP_KERNEL);
-	if(hi == NULL) 
-		return(NULL);
-
-	*hi = ((struct hostfs_inode_info) { .host_filename	= NULL,
-					    .fd			= -1,
-					    .mode		= 0 });
-	inode_init_once(&hi->vfs_inode);
-	return(&hi->vfs_inode);
-}
-
-static void hostfs_destroy_inode(struct inode *inode)
-{
-	if(HOSTFS_I(inode)->host_filename) 
-		kfree(HOSTFS_I(inode)->host_filename);
-
-	if(HOSTFS_I(inode)->fd != -1) 
-		hostfs_close_file(&HOSTFS_I(inode)->fd);
-
-	kfree(HOSTFS_I(inode));
-}
-
-static void hostfs_read_inode(struct inode *inode)
-{
-	read_inode(inode);
-}
-
-static struct super_operations hostfs_sbops = { 
-	.alloc_inode	= hostfs_alloc_inode,
-	.destroy_inode	= hostfs_destroy_inode,
-	.read_inode	= hostfs_read_inode,
-	.statfs		= hostfs_statfs,
-};
-
-int hostfs_readdir(struct file *file, void *ent, filldir_t filldir)
-{
-	void *dir;
-	char *name;
-	unsigned long long next, ino;
-	int error, len;
-
-	name = dentry_name(file->f_dentry, 0);
-	if(name == NULL) return(-ENOMEM);
-	dir = hostfs_open_dir(name, &error);
-	kfree(name);
-	if(dir == NULL) return(-error);
-	next = file->f_pos;
-	while((name = read_dir(dir, &next, &ino, &len)) != NULL){
-		error = (*filldir)(ent, name, len, file->f_pos, 
-				   ino, DT_UNKNOWN);
-		if(error) break;
-		file->f_pos = next;
-	}
-	close_dir(dir);
-	return(0);
-}
-
-int hostfs_file_open(struct inode *ino, struct file *file)
-{
-	char *name;
-	int mode = 0, r = 0, w = 0, fd;
-
-	mode = file->f_mode & (FMODE_READ | FMODE_WRITE);
-	if((mode & HOSTFS_I(ino)->mode) == mode)
-		return(0);
-
-	/* The file may already have been opened, but with the wrong access,
-	 * so this resets things and reopens the file with the new access.
-	 */
-	if(HOSTFS_I(ino)->fd != -1){
-		hostfs_close_file(&HOSTFS_I(ino)->fd);
-		HOSTFS_I(ino)->fd = -1;
-	}
-
-	HOSTFS_I(ino)->mode |= mode;
-	if(HOSTFS_I(ino)->mode & FMODE_READ) 
-		r = 1;
-	if(HOSTFS_I(ino)->mode & FMODE_WRITE) 
-		w = 1;
-	if(w) 
-		r = 1;
-
-	name = dentry_name(file->f_dentry, 0);
-	if(name == NULL) 
-		return(-ENOMEM);
-
-	fd = hostfs_open_file(name, r, w, append);
-	kfree(name);
-	if(fd < 0) return(fd);
-	FILE_HOSTFS_I(file)->fd = fd;
-
-	return(0);
-}
-
-int hostfs_fsync(struct file *file, struct dentry *dentry, int datasync)
-{
-	return(0);
-}
-
-static struct file_operations hostfs_file_fops = {
-	.llseek		= generic_file_llseek,
-	.read		= generic_file_read,
-	.write		= generic_file_write,
-	.mmap		= generic_file_mmap,
-	.open		= hostfs_file_open,
-	.release	= NULL,
-	.fsync		= hostfs_fsync,
-};
-
-static struct file_operations hostfs_dir_fops = {
-	.readdir	= hostfs_readdir,
-	.read		= generic_read_dir,
-};
-
-int hostfs_writepage(struct page *page, struct writeback_control *wbc)
-{
-	struct address_space *mapping = page->mapping;
-	struct inode *inode = mapping->host;
-	char *buffer;
-	unsigned long long base;
-	int count = PAGE_CACHE_SIZE;
-	int end_index = inode->i_size >> PAGE_CACHE_SHIFT;
-	int err;
-
-	if (page->index >= end_index)
-		count = inode->i_size & (PAGE_CACHE_SIZE-1);
-
-	buffer = kmap(page);
-	base = ((unsigned long long) page->index) << PAGE_CACHE_SHIFT;
-
-	err = hostfs_write_file(HOSTFS_I(inode)->fd, &base, buffer, count);
-	if(err != count){
-		ClearPageUptodate(page);
-		goto out;
-	}
-
-	if (base > inode->i_size)
-		inode->i_size = base;
-
-	if (PageError(page))
-		ClearPageError(page);	
-	err = 0;
-
- out:	
-	kunmap(page);
-
-	unlock_page(page);
-	return err; 
-}
-
-int hostfs_readpage(struct file *file, struct page *page)
-{
-	char *buffer;
-	long long start;
-	int err = 0;
-
-	start = (long long) page->index << PAGE_CACHE_SHIFT;
-	buffer = kmap(page);
-	err = hostfs_read_file(FILE_HOSTFS_I(file)->fd, &start, buffer,
-			PAGE_CACHE_SIZE);
-	if(err < 0) goto out;
-
-	memset(&buffer[err], 0, PAGE_CACHE_SIZE - err);
-
-	flush_dcache_page(page);
-	SetPageUptodate(page);
-	if (PageError(page)) ClearPageError(page);
-	err = 0;
- out:
-	kunmap(page);
-	unlock_page(page);
-	return(err);
-}
-
-int hostfs_prepare_write(struct file *file, struct page *page, 
-			 unsigned int from, unsigned int to)
-{
-	char *buffer;
-	long long start, tmp;
-	int err;
-
-	start = (long long) page->index << PAGE_CACHE_SHIFT;
-	buffer = kmap(page);
-	if(from != 0){
-		tmp = start;
-		err = hostfs_read_file(FILE_HOSTFS_I(file)->fd, &tmp, buffer,
-				from);
-		if(err < 0) goto out;
-	}
-	if(to != PAGE_CACHE_SIZE){
-		start += to;
-		err = hostfs_read_file(FILE_HOSTFS_I(file)->fd, &start, buffer + to,
-				PAGE_CACHE_SIZE - to);
-		if(err < 0) goto out;		
-	}
-	err = 0;
- out:
-	kunmap(page);
-	return(err);
-}
-
-int hostfs_commit_write(struct file *file, struct page *page, unsigned from,
-		 unsigned to)
-{
-	struct address_space *mapping = page->mapping;
-	struct inode *inode = mapping->host;
-	char *buffer;
-	long long start;
-	int err = 0;
-
-	start = (long long) (page->index << PAGE_CACHE_SHIFT) + from;
-	buffer = kmap(page);
-	err = hostfs_write_file(FILE_HOSTFS_I(file)->fd, &start, buffer + from, 
-			 to - from);
-	if(err > 0) err = 0;
-	if(!err && (start > inode->i_size))
-		inode->i_size = start;
-
-	kunmap(page);
-	return(err);
-}
-
-static struct address_space_operations hostfs_aops = {
-	.writepage 	= hostfs_writepage,
-	.readpage	= hostfs_readpage,
-/* 	.set_page_dirty = __set_page_dirty_nobuffers, */
-	.prepare_write	= hostfs_prepare_write,
-	.commit_write	= hostfs_commit_write
-};
-
-static int init_inode(struct inode *inode, struct dentry *dentry)
-{
-	char *name;
-	int type, err = -ENOMEM, rdev;
-
-	if(dentry){
-		name = dentry_name(dentry, 0);
-		if(name == NULL)
-			goto out;
-		type = file_type(name, &rdev);
-		kfree(name);
-	}
-	else type = OS_TYPE_DIR;
-
-	err = 0;
-	if(type == OS_TYPE_SYMLINK)
-		inode->i_op = &page_symlink_inode_operations;
-	else if(type == OS_TYPE_DIR)
-		inode->i_op = &hostfs_dir_iops;
-	else inode->i_op = &hostfs_iops;
-
-	if(type == OS_TYPE_DIR) inode->i_fop = &hostfs_dir_fops;
-	else inode->i_fop = &hostfs_file_fops;
-
-	if(type == OS_TYPE_SYMLINK) 
-		inode->i_mapping->a_ops = &hostfs_link_aops;
-	else inode->i_mapping->a_ops = &hostfs_aops;
-
-	switch (type) {
-	case OS_TYPE_CHARDEV:
-		init_special_inode(inode, S_IFCHR, rdev);
-		break;
-	case OS_TYPE_BLOCKDEV:
-		init_special_inode(inode, S_IFBLK, rdev);
-		break;
-	case OS_TYPE_FIFO:
-		init_special_inode(inode, S_IFIFO, 0);
-		break;
-	case OS_TYPE_SOCK:
-		init_special_inode(inode, S_IFSOCK, 0);
-		break;
-	}
- out:
-	return(err);
-}
-
-int hostfs_create(struct inode *dir, struct dentry *dentry, int mode, 
-                 struct nameidata *nd)
-{
-	struct inode *inode;
-	char *name;
-	int error, fd;
-
-	error = -ENOMEM;
-	inode = iget(dir->i_sb, 0);
-	if(inode == NULL) goto out;
-
-	error = init_inode(inode, dentry);
-	if(error) 
-		goto out_put;
-	
-	error = -ENOMEM;
-	name = dentry_name(dentry, 0);
-	if(name == NULL)
-		goto out_put;
-
-	fd = file_create(name, 
-			 mode & S_IRUSR, mode & S_IWUSR, mode & S_IXUSR, 
-			 mode & S_IRGRP, mode & S_IWGRP, mode & S_IXGRP, 
-			 mode & S_IROTH, mode & S_IWOTH, mode & S_IXOTH);
-	if(fd < 0) 
-		error = fd;
-	else error = read_name(inode, name);
-
-	kfree(name);
-	if(error)
-		goto out_put;
-
-	HOSTFS_I(inode)->fd = fd;
-	HOSTFS_I(inode)->mode = FMODE_READ | FMODE_WRITE;
-	d_instantiate(dentry, inode);
-	return(0);
-
- out_put:
-	iput(inode);
- out:
-	return(error);
-}
-
-struct dentry *hostfs_lookup(struct inode *ino, struct dentry *dentry, 
-                            struct nameidata *nd)
-{
-	struct inode *inode;
-	char *name;
-	int err;
-
-	err = -ENOMEM;
-	inode = iget(ino->i_sb, 0);
-	if(inode == NULL) 
-		goto out;
- 
-	err = init_inode(inode, dentry);
-	if(err) 
-		goto out_put;
-
-	err = -ENOMEM;
-	name = dentry_name(dentry, 0);
-	if(name == NULL)
-		goto out_put;
-
-	err = read_name(inode, name);
-	kfree(name);
-	if(err == -ENOENT){
-		iput(inode);
-		inode = NULL;
-	}
-	else if(err)
-		goto out_put;
-
-	d_add(dentry, inode);
-	dentry->d_op = &hostfs_dentry_ops;
-	return(NULL);
-
- out_put:
-	iput(inode);
- out:
-	return(ERR_PTR(err));
-}
-
-static char *inode_dentry_name(struct inode *ino, struct dentry *dentry)
-{
-        char *file;
-	int len;
-
-	file = inode_name(ino, dentry->d_name.len + 1);
-	if(file == NULL) return(NULL);
-        strcat(file, "/");
-	len = strlen(file);
-        strncat(file, dentry->d_name.name, dentry->d_name.len);
-	file[len + dentry->d_name.len] = '\0';
-        return(file);
-}
-
-int hostfs_link(struct dentry *to, struct inode *ino, struct dentry *from)
-{
-        char *from_name, *to_name;
-        int err;
-
-        if((from_name = inode_dentry_name(ino, from)) == NULL) 
-                return(-ENOMEM);
-        to_name = dentry_name(to, 0);
-	if(to_name == NULL){
-		kfree(from_name);
-		return(-ENOMEM);
-	}
-        err = link_file(to_name, from_name);
-        kfree(from_name);
-        kfree(to_name);
-        return(err);
-}
-
-int hostfs_unlink(struct inode *ino, struct dentry *dentry)
-{
-	char *file;
-	int err;
-
-	if((file = inode_dentry_name(ino, dentry)) == NULL) return(-ENOMEM);
-	if(append)
-		return(-EPERM);
-
-	err = unlink_file(file);
-	kfree(file);
-	return(err);
-}
-
-int hostfs_symlink(struct inode *ino, struct dentry *dentry, const char *to)
-{
-	char *file;
-	int err;
-
-	if((file = inode_dentry_name(ino, dentry)) == NULL) return(-ENOMEM);
-	err = make_symlink(file, to);
-	kfree(file);
-	return(err);
-}
-
-int hostfs_mkdir(struct inode *ino, struct dentry *dentry, int mode)
-{
-	char *file;
-	int err;
-
-	if((file = inode_dentry_name(ino, dentry)) == NULL) return(-ENOMEM);
-	err = do_mkdir(file, mode);
-	kfree(file);
-	return(err);
-}
-
-int hostfs_rmdir(struct inode *ino, struct dentry *dentry)
-{
-	char *file;
-	int err;
-
-	if((file = inode_dentry_name(ino, dentry)) == NULL) return(-ENOMEM);
-	err = do_rmdir(file);
-	kfree(file);
-	return(err);
-}
-
-int hostfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev)
-{
-	struct inode *inode;
-	char *name;
-	int err = -ENOMEM;
- 
-	inode = iget(dir->i_sb, 0);
-	if(inode == NULL) 
-		goto out;
-
-	err = init_inode(inode, dentry);
-	if(err) 
-		goto out_put;
-
-	err = -ENOMEM;
-	name = dentry_name(dentry, 0);
-	if(name == NULL)
-		goto out_put;
-
-	init_special_inode(inode, mode, dev);
-	err = do_mknod(name, mode, dev);
-	if(err)
-		goto out_free;
-
-	err = read_name(inode, name);
-	kfree(name);
-	if(err)
-		goto out_put;
-
-	d_instantiate(dentry, inode);
-	return(0);
-
- out_free:
-	kfree(name);
- out_put:
-	iput(inode);
- out:
-	return(err);
-}
-
-int hostfs_rename(struct inode *from_ino, struct dentry *from,
-		  struct inode *to_ino, struct dentry *to)
-{
-	char *from_name, *to_name;
-	int err;
-
-	if((from_name = inode_dentry_name(from_ino, from)) == NULL)
-		return(-ENOMEM);
-	if((to_name = inode_dentry_name(to_ino, to)) == NULL){
-		kfree(from_name);
-		return(-ENOMEM);
-	}
-	err = rename_file(from_name, to_name);
-	kfree(from_name);
-	kfree(to_name);
-	return(err);
-}
-
-void hostfs_truncate(struct inode *ino)
-{
-	not_implemented();
-}
-
-int hostfs_permission(struct inode *ino, int desired, struct nameidata *nd)
-{
-	char *name;
-	int r = 0, w = 0, x = 0, err;
-
-	if(desired & MAY_READ) r = 1;
-	if(desired & MAY_WRITE) w = 1;
-	if(desired & MAY_EXEC) x = 1;
-	name = inode_name(ino, 0);
-	if(name == NULL) return(-ENOMEM);
-	err = access_file(name, r, w, x);
-	kfree(name);
-	if(!err) err = vfs_permission(ino, desired);
-	return(err);
-}
-
-int hostfs_setattr(struct dentry *dentry, struct iattr *attr)
-{
-	struct hostfs_iattr attrs;
-	char *name;
-	int err;
-	
-	if(append) 
-		attr->ia_valid &= ~ATTR_SIZE;
-
-	attrs.ia_valid = 0;
-	if(attr->ia_valid & ATTR_MODE){
-		attrs.ia_valid |= HOSTFS_ATTR_MODE;
-		attrs.ia_mode = attr->ia_mode;
-	}
-	if(attr->ia_valid & ATTR_UID){
-		if((dentry->d_inode->i_sb->s_dev == ROOT_DEV) && 
-		   (attr->ia_uid == 0))
-			attr->ia_uid = getuid();
-		attrs.ia_valid |= HOSTFS_ATTR_UID;
-		attrs.ia_uid = attr->ia_uid;
-	}
-	if(attr->ia_valid & ATTR_GID){
-		if((dentry->d_inode->i_sb->s_dev == ROOT_DEV) && 
-		   (attr->ia_gid == 0))
-			attr->ia_gid = getuid();
-		attrs.ia_valid |= HOSTFS_ATTR_GID;
-		attrs.ia_gid = attr->ia_gid;
-	}
-	if(attr->ia_valid & ATTR_SIZE){
-		attrs.ia_valid |= HOSTFS_ATTR_SIZE;
-		attrs.ia_size = attr->ia_size;
-	}
-	if(attr->ia_valid & ATTR_ATIME){
-		attrs.ia_valid |= HOSTFS_ATTR_ATIME;
-		attrs.ia_atime = attr->ia_atime;
-	}
-	if(attr->ia_valid & ATTR_MTIME){
-		attrs.ia_valid |= HOSTFS_ATTR_MTIME;
-		attrs.ia_mtime = attr->ia_mtime;
-	}
-	if(attr->ia_valid & ATTR_CTIME){
-		attrs.ia_valid |= HOSTFS_ATTR_CTIME;
-		attrs.ia_ctime = attr->ia_ctime;
-	}
-	if(attr->ia_valid & ATTR_ATIME_SET){
-		attrs.ia_valid |= HOSTFS_ATTR_ATIME_SET;
-	}
-	if(attr->ia_valid & ATTR_MTIME_SET){
-		attrs.ia_valid |= HOSTFS_ATTR_MTIME_SET;
-	}
-	name = dentry_name(dentry, 0);
-	if(name == NULL) return(-ENOMEM);
-	err = set_attr(name, &attrs);
-	kfree(name);
-	if(err)
-		return(err);
-
-	return(inode_setattr(dentry->d_inode, attr));
-}
-
-int hostfs_getattr(struct vfsmount *mnt, struct dentry *dentry, 
-	   struct kstat *stat)
-{
-	generic_fillattr(dentry->d_inode, stat);
-	return(0);
-}
-
-static struct inode_operations hostfs_iops = {
-	.create		= hostfs_create,
-	.link		= hostfs_link,
-	.unlink		= hostfs_unlink,
-	.symlink	= hostfs_symlink,
-	.mkdir		= hostfs_mkdir,
-	.rmdir		= hostfs_rmdir,
-	.mknod		= hostfs_mknod,
-	.rename		= hostfs_rename,
-	.truncate	= hostfs_truncate,
-	.permission	= hostfs_permission,
-	.setattr	= hostfs_setattr,
-	.getattr	= hostfs_getattr,
-};
-
-static struct inode_operations hostfs_dir_iops = {
-	.create		= hostfs_create,
-	.lookup		= hostfs_lookup,
-	.link		= hostfs_link,
-	.unlink		= hostfs_unlink,
-	.symlink	= hostfs_symlink,
-	.mkdir		= hostfs_mkdir,
-	.rmdir		= hostfs_rmdir,
-	.mknod		= hostfs_mknod,
-	.rename		= hostfs_rename,
-	.truncate	= hostfs_truncate,
-	.permission	= hostfs_permission,
-	.setattr	= hostfs_setattr,
-	.getattr	= hostfs_getattr,
-};
-
-int hostfs_link_readpage(struct file *file, struct page *page)
-{
-	char *buffer, *name;
-	long long start;
-	int err;
-
-	start = page->index << PAGE_CACHE_SHIFT;
-	buffer = kmap(page);
-	name = inode_name(page->mapping->host, 0);
-	if(name == NULL) return(-ENOMEM);
-	err = do_readlink(name, buffer, PAGE_CACHE_SIZE);
-	kfree(name);
-	if(err == PAGE_CACHE_SIZE)
-		err = -E2BIG;
-	else if(err > 0){
-		flush_dcache_page(page);
-		SetPageUptodate(page);
-		if (PageError(page)) ClearPageError(page);
-		err = 0;
-	}
-	kunmap(page);
-	unlock_page(page);
-	return(err);
-}
-
-static struct address_space_operations hostfs_link_aops = {
-	.readpage	= hostfs_link_readpage,
-};
-
-static int hostfs_fill_sb_common(struct super_block *sb, void *d, int silent)
-{
-	struct inode *root_inode;
-	char *name, *data = d;
-	int err;
-
-	sb->s_blocksize = 1024;
-	sb->s_blocksize_bits = 10;
-	sb->s_magic = HOSTFS_SUPER_MAGIC;
-	sb->s_op = &hostfs_sbops;
-
-	if((data == NULL) || (*data == '\0')) 
-		data = root_ino;
-
-	err = -ENOMEM;
-	name = kmalloc(strlen(data) + 1, GFP_KERNEL);
-	if(name == NULL) 
-		goto out;
-
-	strcpy(name, data);
-
-	root_inode = iget(sb, 0);
-	if(root_inode == NULL)
-		goto out_free;
-
-	err = init_inode(root_inode, NULL);
-	if(err)
-		goto out_put;
-
-	HOSTFS_I(root_inode)->host_filename = name;
-
-	err = -ENOMEM;
-	sb->s_root = d_alloc_root(root_inode);
-	if(sb->s_root == NULL)
-		goto out_put;
-
-	err = read_inode(root_inode);
-	if(err)
-		goto out_put;
-
-	return(0);
-
- out_put:
-	iput(root_inode);
- out_free:
-	kfree(name);
- out:
-	return(err);
-}
-
-static struct super_block *hostfs_read_sb(struct file_system_type *type,
-					     int flags, const char *dev_name,
-					     void *data)
-{
-	return(get_sb_nodev(type, flags, data, hostfs_fill_sb_common));
-}
-
-static struct file_system_type hostfs_type = {
-	.owner 		= THIS_MODULE,
-	.name 		= "hostfs",
-	.get_sb 	= hostfs_read_sb,
-	.kill_sb	= kill_anon_super,
-	.fs_flags 	= 0,
-};
-
-static int __init init_hostfs(void)
-{
-	return(register_filesystem(&hostfs_type));
-}
-
-static void __exit exit_hostfs(void)
-{
-	unregister_filesystem(&hostfs_type);
-}
-
-module_init(init_hostfs)
-module_exit(exit_hostfs)
-MODULE_LICENSE("GPL");
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */
Index: um/fs/hostfs/hostfs_user.c
===================================================================
--- um.orig/fs/hostfs/hostfs_user.c	2004-08-10 15:06:41.000000000 -0400
+++ um/fs/hostfs/hostfs_user.c	2003-09-15 09:40:47.000000000 -0400
@@ -1,361 +0,0 @@
-/* 
- * Copyright (C) 2000 Jeff Dike (jdike@karaya.com)
- * Licensed under the GPL
- */
-
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <dirent.h>
-#include <errno.h>
-#include <utime.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/vfs.h>
-#include "hostfs.h"
-#include "kern_util.h"
-#include "user.h"
-
-int stat_file(const char *path, unsigned long long *inode_out, int *mode_out,
-	      int *nlink_out, int *uid_out, int *gid_out, 
-	      unsigned long long *size_out, struct timespec *atime_out,
-	      struct timespec *mtime_out, struct timespec *ctime_out,
-	      int *blksize_out, unsigned long long *blocks_out)
-{
-	struct stat64 buf;
-
-	if(lstat64(path, &buf) < 0) 
-		return(-errno);
-
-	/* See the Makefile for why STAT64_INO_FIELD is passed in
-	 * by the build
-	 */
-	if(inode_out != NULL) *inode_out = buf.STAT64_INO_FIELD;
-	if(mode_out != NULL) *mode_out = buf.st_mode;
-	if(nlink_out != NULL) *nlink_out = buf.st_nlink;
-	if(uid_out != NULL) *uid_out = buf.st_uid;
-	if(gid_out != NULL) *gid_out = buf.st_gid;
-	if(size_out != NULL) *size_out = buf.st_size;
-	if(atime_out != NULL) {
-		atime_out->tv_sec = buf.st_atime;
-		atime_out->tv_nsec = 0;
-	}
-	if(mtime_out != NULL) {
-		mtime_out->tv_sec = buf.st_mtime;
-		mtime_out->tv_nsec = 0;
-	}
-	if(ctime_out != NULL) {
-		ctime_out->tv_sec = buf.st_ctime;
-		ctime_out->tv_nsec = 0;
-	}
-	if(blksize_out != NULL) *blksize_out = buf.st_blksize;
-	if(blocks_out != NULL) *blocks_out = buf.st_blocks;
-	return(0);
-}
-
-int file_type(const char *path, int *rdev)
-{
- 	struct stat64 buf;
-
-	if(lstat64(path, &buf) < 0) 
-		return(-errno);
-	if(rdev != NULL) 
-		*rdev = buf.st_rdev;
-
-	if(S_ISDIR(buf.st_mode)) return(OS_TYPE_DIR);
-	else if(S_ISLNK(buf.st_mode)) return(OS_TYPE_SYMLINK);
-	else if(S_ISCHR(buf.st_mode)) return(OS_TYPE_CHARDEV);
-	else if(S_ISBLK(buf.st_mode)) return(OS_TYPE_BLOCKDEV);
-	else if(S_ISFIFO(buf.st_mode))return(OS_TYPE_FIFO);
-	else if(S_ISSOCK(buf.st_mode))return(OS_TYPE_SOCK);
-	else return(OS_TYPE_FILE);
-}
-
-int access_file(char *path, int r, int w, int x)
-{
-	int mode = 0;
-
-	if(r) mode = R_OK;
-	if(w) mode |= W_OK;
-	if(x) mode |= X_OK;
-	if(access(path, mode) != 0) return(-errno);
-	else return(0);
-}
-
-int hostfs_open_file(char *path, int r, int w, int append)
-{
-	int mode = 0, fd;
-
-	if(r && !w) 
-		mode = O_RDONLY;
-	else if(!r && w) 
-		mode = O_WRONLY;
-	else if(r && w) 
-		mode = O_RDWR;
-	else panic("Impossible mode in open_file");
-
-	if(append)
-		mode |= O_APPEND;
-	fd = open64(path, mode);
-	if(fd < 0) return(-errno);
-	else return(fd);
-}
-
-void *hostfs_open_dir(char *path, int *err_out)
-{
-	DIR *dir;
-
-	dir = opendir(path);
-	*err_out = errno;
-	if(dir == NULL) return(NULL);
-	return(dir);
-}
-
-char *read_dir(void *stream, unsigned long long *pos, 
-	       unsigned long long *ino_out, int *len_out)
-{
-	DIR *dir = stream;
-	struct dirent *ent;
-
-	seekdir(dir, *pos);
-	ent = readdir(dir);
-	if(ent == NULL) return(NULL);
-	*len_out = strlen(ent->d_name);
-	*ino_out = ent->d_ino;
-	*pos = telldir(dir);
-	return(ent->d_name);
-}
-
-int hostfs_read_file(int fd, unsigned long long *offset, char *buf, int len)
-{
-	int n;
-
-	n = pread64(fd, buf, len, *offset);
-	if(n < 0) return(-errno);
-	*offset += n;
-	return(n);
-}
-
-int hostfs_write_file(int fd, unsigned long long *offset, const char *buf, int len)
-{
-	int n;
-
-	n = pwrite64(fd, buf, len, *offset);
-	if(n < 0) return(-errno);
-	*offset += n;
-	return(n);
-}
-
-int lseek_file(int fd, long long offset, int whence)
-{
-	int ret;
-
-	ret = lseek64(fd, offset, whence);
-	if(ret < 0) return(-errno);
-	return(0);
-}
-
-void hostfs_close_file(void *stream)
-{
-	close(*((int *) stream));
-}
-
-void close_dir(void *stream)
-{
-	closedir(stream);
-}
-
-int file_create(char *name, int ur, int uw, int ux, int gr, 
-		int gw, int gx, int or, int ow, int ox)
-{
-	int mode, fd;
-
-	mode = 0;
-	mode |= ur ? S_IRUSR : 0;
-	mode |= uw ? S_IWUSR : 0;
-	mode |= ux ? S_IXUSR : 0;
-	mode |= gr ? S_IRGRP : 0;
-	mode |= gw ? S_IWGRP : 0;
-	mode |= gx ? S_IXGRP : 0;
-	mode |= or ? S_IROTH : 0;
-	mode |= ow ? S_IWOTH : 0;
-	mode |= ox ? S_IXOTH : 0;
-	fd = open64(name, O_CREAT | O_RDWR, mode);
-	if(fd < 0) 
-		return(-errno);
-	return(fd);
-}
-
-int set_attr(const char *file, struct hostfs_iattr *attrs)
-{
-	struct utimbuf buf;
-	int err, ma;
-
-	if(attrs->ia_valid & HOSTFS_ATTR_MODE){
-		if(chmod(file, attrs->ia_mode) != 0) return(-errno);
-	}
-	if(attrs->ia_valid & HOSTFS_ATTR_UID){
-		if(chown(file, attrs->ia_uid, -1)) return(-errno);
-	}
-	if(attrs->ia_valid & HOSTFS_ATTR_GID){
-		if(chown(file, -1, attrs->ia_gid)) return(-errno);
-	}
-	if(attrs->ia_valid & HOSTFS_ATTR_SIZE){
-		if(truncate(file, attrs->ia_size)) return(-errno);
-	}
-	ma = HOSTFS_ATTR_ATIME_SET | HOSTFS_ATTR_MTIME_SET;
-	if((attrs->ia_valid & ma) == ma){
-		buf.actime = attrs->ia_atime.tv_sec;
-		buf.modtime = attrs->ia_mtime.tv_sec;
-		if(utime(file, &buf) != 0) return(-errno);
-	}
-	else {
-		struct timespec ts;
-
-		if(attrs->ia_valid & HOSTFS_ATTR_ATIME_SET){
-			err = stat_file(file, NULL, NULL, NULL, NULL, NULL, 
-					NULL, NULL, &ts, NULL, NULL, NULL);
-			if(err != 0) 
-				return(err);
-			buf.actime = attrs->ia_atime.tv_sec;
-			buf.modtime = ts.tv_sec;
-			if(utime(file, &buf) != 0) 
-				return(-errno);
-		}
-		if(attrs->ia_valid & HOSTFS_ATTR_MTIME_SET){
-			err = stat_file(file, NULL, NULL, NULL, NULL, NULL, 
-					NULL, &ts, NULL, NULL, NULL, NULL);
-			if(err != 0) 
-				return(err);
-			buf.actime = ts.tv_sec;
-			buf.modtime = attrs->ia_mtime.tv_sec;
-			if(utime(file, &buf) != 0) 
-				return(-errno);
-		}
-	}
-	if(attrs->ia_valid & HOSTFS_ATTR_CTIME) ;
-	if(attrs->ia_valid & (HOSTFS_ATTR_ATIME | HOSTFS_ATTR_MTIME)){
-		err = stat_file(file, NULL, NULL, NULL, NULL, NULL, NULL, 
-				&attrs->ia_atime, &attrs->ia_mtime, NULL, 
-				NULL, NULL);
-		if(err != 0) return(err);
-	}
-	return(0);
-}
-
-int make_symlink(const char *from, const char *to)
-{
-	int err;
-
-	err = symlink(to, from);
-	if(err) return(-errno);
-	return(0);
-}
-
-int unlink_file(const char *file)
-{
-	int err;
-
-	err = unlink(file);
-	if(err) return(-errno);
-	return(0);
-}
-
-int do_mkdir(const char *file, int mode)
-{
-	int err;
-
-	err = mkdir(file, mode);
-	if(err) return(-errno);
-	return(0);
-}
-
-int do_rmdir(const char *file)
-{
-	int err;
-
-	err = rmdir(file);
-	if(err) return(-errno);
-	return(0);
-}
-
-int do_mknod(const char *file, int mode, int dev)
-{
-	int err;
-
-	err = mknod(file, mode, dev);
-	if(err) return(-errno);
-	return(0);
-}
-
-int link_file(const char *to, const char *from)
-{
-	int err;
-
-	err = link(to, from);
-	if(err) return(-errno);
-	return(0);
-}
-
-int do_readlink(char *file, char *buf, int size)
-{
-	int n;
-
-	n = readlink(file, buf, size);
-	if(n < 0) 
-		return(-errno);
-	if(n < size) 
-		buf[n] = '\0';
-	return(n);
-}
-
-int rename_file(char *from, char *to)
-{
-	int err;
-
-	err = rename(from, to);
-	if(err < 0) return(-errno);
-	return(0);	
-}
-
-int do_statfs(char *root, long *bsize_out, long long *blocks_out, 
-	      long long *bfree_out, long long *bavail_out, 
-	      long long *files_out, long long *ffree_out,
-	      void *fsid_out, int fsid_size, long *namelen_out, 
-	      long *spare_out)
-{
-	struct statfs64 buf;
-	int err;
-
-	err = statfs64(root, &buf);
-	if(err < 0) return(-errno);
-	*bsize_out = buf.f_bsize;
-	*blocks_out = buf.f_blocks;
-	*bfree_out = buf.f_bfree;
-	*bavail_out = buf.f_bavail;
-	*files_out = buf.f_files;
-	*ffree_out = buf.f_ffree;
-	memcpy(fsid_out, &buf.f_fsid, 
-	       sizeof(buf.f_fsid) > fsid_size ? fsid_size : 
-	       sizeof(buf.f_fsid));
-	*namelen_out = buf.f_namelen;
-	spare_out[0] = buf.f_spare[0];
-	spare_out[1] = buf.f_spare[1];
-	spare_out[2] = buf.f_spare[2];
-	spare_out[3] = buf.f_spare[3];
-	spare_out[4] = buf.f_spare[4];
-	spare_out[5] = buf.f_spare[5];
-	return(0);
-}
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */