uml: hostfs style fixes (f1adc05e) · Commits · e / devices / android_kernel_fairphone_FP4

fs/hostfs/hostfs.h

+0 −11

Original line number	Original line	Diff line number	Diff line
	@@ -87,14 +87,3 @@ extern int do_statfs(char root, long bsize_out, long long *blocks_out,
	long *spare_out);		long *spare_out);

	#endif		#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:
	*/

fs/hostfs/hostfs_kern.c

+94 −92

Original line number	Original line	Diff line number	Diff line
	/*		/*
	* Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com)		* Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
	* Licensed under the GPL		* Licensed under the GPL
	*		*
	* Ported the filesystem routines to 2.5.		* Ported the filesystem routines to 2.5.
	@@ -31,14 +31,14 @@ struct hostfs_inode_info {

	static inline struct hostfs_inode_info HOSTFS_I(struct inode inode)		static inline struct hostfs_inode_info HOSTFS_I(struct inode inode)
	{		{
	return(list_entry(inode, struct hostfs_inode_info, vfs_inode));		return list_entry(inode, struct hostfs_inode_info, vfs_inode);
	}		}

	#define FILE_HOSTFS_I(file) HOSTFS_I((file)->f_path.dentry->d_inode)		#define FILE_HOSTFS_I(file) HOSTFS_I((file)->f_path.dentry->d_inode)

	int hostfs_d_delete(struct dentry *dentry)		int hostfs_d_delete(struct dentry *dentry)
	{		{
	return(1);		return 1;
	}		}

	struct dentry_operations hostfs_dentry_ops = {		struct dentry_operations hostfs_dentry_ops = {
	@@ -79,7 +79,7 @@ static int __init hostfs_args(char options, int add)
	}		}
	options = ptr;		options = ptr;
	}		}
	return(0);		return 0;
	}		}

	__uml_setup("hostfs=", hostfs_args,		__uml_setup("hostfs=", hostfs_args,
	@@ -110,7 +110,8 @@ static char dentry_name(struct dentry dentry, int extra)
	root = HOSTFS_I(parent->d_inode)->host_filename;		root = HOSTFS_I(parent->d_inode)->host_filename;
	len += strlen(root);		len += strlen(root);
	name = kmalloc(len + extra + 1, GFP_KERNEL);		name = kmalloc(len + extra + 1, GFP_KERNEL);
	if(name == NULL) return(NULL);		if(name == NULL)
			return NULL;

	name[len] = '\0';		name[len] = '\0';
	parent = dentry;		parent = dentry;
	@@ -122,7 +123,7 @@ static char dentry_name(struct dentry dentry, int extra)
	parent = parent->d_parent;		parent = parent->d_parent;
	}		}
	strncpy(name, root, strlen(root));		strncpy(name, root, strlen(root));
	return(name);		return name;
	}		}

	static char inode_name(struct inode ino, int extra)		static char inode_name(struct inode ino, int extra)
	@@ -130,7 +131,7 @@ static char inode_name(struct inode ino, int extra)
	struct dentry *dentry;		struct dentry *dentry;

	dentry = list_entry(ino->i_dentry.next, struct dentry, d_alias);		dentry = list_entry(ino->i_dentry.next, struct dentry, d_alias);
	return(dentry_name(dentry, extra));		return dentry_name(dentry, extra);
	}		}

	static int read_name(struct inode ino, char name)		static int read_name(struct inode ino, char name)
	@@ -149,14 +150,14 @@ static int read_name(struct inode ino, char name)
	&ino->i_gid, &i_size, &ino->i_atime, &ino->i_mtime,		&ino->i_gid, &i_size, &ino->i_atime, &ino->i_mtime,
	&ino->i_ctime, &i_blksize, &i_blocks, -1);		&ino->i_ctime, &i_blksize, &i_blocks, -1);
	if(err)		if(err)
	return(err);		return err;

	ino->i_ino = i_ino;		ino->i_ino = i_ino;
	ino->i_mode = i_mode;		ino->i_mode = i_mode;
	ino->i_nlink = i_nlink;		ino->i_nlink = i_nlink;
	ino->i_size = i_size;		ino->i_size = i_size;
	ino->i_blocks = i_blocks;		ino->i_blocks = i_blocks;
	return(0);		return 0;
	}		}

	static char follow_link(char link)		static char follow_link(char link)
	@@ -181,11 +182,11 @@ static char follow_link(char link)
	goto out_free;		goto out_free;

	if(*name == '/')		if(*name == '/')
	return(name);		return name;

	end = strrchr(link, '/');		end = strrchr(link, '/');
	if(end == NULL)		if(end == NULL)
	return(name);		return name;

	*(end + 1) = '\0';		*(end + 1) = '\0';
	len = strlen(link) + strlen(name) + 1;		len = strlen(link) + strlen(name) + 1;
	@@ -199,12 +200,12 @@ static char follow_link(char link)
	sprintf(resolved, "%s%s", link, name);		sprintf(resolved, "%s%s", link, name);
	kfree(name);		kfree(name);
	kfree(link);		kfree(link);
	return(resolved);		return resolved;

	out_free:		out_free:
	kfree(name);		kfree(name);
	out:		out:
	return(ERR_PTR(n));		return ERR_PTR(n);
	}		}

	static int read_inode(struct inode *ino)		static int read_inode(struct inode *ino)
	@@ -234,7 +235,7 @@ static int read_inode(struct inode *ino)
	err = read_name(ino, name);		err = read_name(ino, name);
	kfree(name);		kfree(name);
	out:		out:
	return(err);		return err;
	}		}

	int hostfs_statfs(struct dentry dentry, struct kstatfs sf)		int hostfs_statfs(struct dentry dentry, struct kstatfs sf)
	@@ -254,14 +255,15 @@ int hostfs_statfs(struct dentry dentry, struct kstatfs sf)
	&sf->f_bsize, &f_blocks, &f_bfree, &f_bavail, &f_files,		&sf->f_bsize, &f_blocks, &f_bfree, &f_bavail, &f_files,
	&f_ffree, &sf->f_fsid, sizeof(sf->f_fsid),		&f_ffree, &sf->f_fsid, sizeof(sf->f_fsid),
	&sf->f_namelen, sf->f_spare);		&sf->f_namelen, sf->f_spare);
	if(err) return(err);		if(err)
			return err;
	sf->f_blocks = f_blocks;		sf->f_blocks = f_blocks;
	sf->f_bfree = f_bfree;		sf->f_bfree = f_bfree;
	sf->f_bavail = f_bavail;		sf->f_bavail = f_bavail;
	sf->f_files = f_files;		sf->f_files = f_files;
	sf->f_ffree = f_ffree;		sf->f_ffree = f_ffree;
	sf->f_type = HOSTFS_SUPER_MAGIC;		sf->f_type = HOSTFS_SUPER_MAGIC;
	return(0);		return 0;
	}		}

	static struct inode hostfs_alloc_inode(struct super_block sb)		static struct inode hostfs_alloc_inode(struct super_block sb)
	@@ -270,13 +272,13 @@ static struct inode hostfs_alloc_inode(struct super_block sb)

	hi = kmalloc(sizeof(*hi), GFP_KERNEL);		hi = kmalloc(sizeof(*hi), GFP_KERNEL);
	if(hi == NULL)		if(hi == NULL)
	return(NULL);		return NULL;

	*hi = ((struct hostfs_inode_info) { .host_filename = NULL,		*hi = ((struct hostfs_inode_info) { .host_filename = NULL,
	.fd = -1,		.fd = -1,
	.mode = 0 });		.mode = 0 });
	inode_init_once(&hi->vfs_inode);		inode_init_once(&hi->vfs_inode);
	return(&hi->vfs_inode);		return &hi->vfs_inode;
	}		}

	static void hostfs_delete_inode(struct inode *inode)		static void hostfs_delete_inode(struct inode *inode)
	@@ -325,10 +327,12 @@ int hostfs_readdir(struct file file, void ent, filldir_t filldir)
	int error, len;		int error, len;

	name = dentry_name(file->f_path.dentry, 0);		name = dentry_name(file->f_path.dentry, 0);
	if(name == NULL) return(-ENOMEM);		if(name == NULL)
			return -ENOMEM;
	dir = open_dir(name, &error);		dir = open_dir(name, &error);
	kfree(name);		kfree(name);
	if(dir == NULL) return(-error);		if(dir == NULL)
			return -error;
	next = file->f_pos;		next = file->f_pos;
	while((name = read_dir(dir, &next, &ino, &len)) != NULL){		while((name = read_dir(dir, &next, &ino, &len)) != NULL){
	error = (*filldir)(ent, name, len, file->f_pos,		error = (*filldir)(ent, name, len, file->f_pos,
	@@ -337,7 +341,7 @@ int hostfs_readdir(struct file file, void ent, filldir_t filldir)
	file->f_pos = next;		file->f_pos = next;
	}		}
	close_dir(dir);		close_dir(dir);
	return(0);		return 0;
	}		}

	int hostfs_file_open(struct inode ino, struct file file)		int hostfs_file_open(struct inode ino, struct file file)
	@@ -347,7 +351,7 @@ int hostfs_file_open(struct inode ino, struct file file)

	mode = file->f_mode & (FMODE_READ \| FMODE_WRITE);		mode = file->f_mode & (FMODE_READ \| FMODE_WRITE);
	if((mode & HOSTFS_I(ino)->mode) == mode)		if((mode & HOSTFS_I(ino)->mode) == mode)
	return(0);		return 0;

	/* The file may already have been opened, but with the wrong access,		/* The file may already have been opened, but with the wrong access,
	* so this resets things and reopens the file with the new access.		* so this resets things and reopens the file with the new access.
	@@ -367,14 +371,15 @@ int hostfs_file_open(struct inode ino, struct file file)

	name = dentry_name(file->f_path.dentry, 0);		name = dentry_name(file->f_path.dentry, 0);
	if(name == NULL)		if(name == NULL)
	return(-ENOMEM);		return -ENOMEM;

	fd = open_file(name, r, w, append);		fd = open_file(name, r, w, append);
	kfree(name);		kfree(name);
	if(fd < 0) return(fd);		if(fd < 0)
			return fd;
	FILE_HOSTFS_I(file)->fd = fd;		FILE_HOSTFS_I(file)->fd = fd;

	return(0);		return 0;
	}		}

	int hostfs_fsync(struct file file, struct dentry dentry, int datasync)		int hostfs_fsync(struct file file, struct dentry dentry, int datasync)
	@@ -458,7 +463,7 @@ int hostfs_readpage(struct file file, struct page page)
	out:		out:
	kunmap(page);		kunmap(page);
	unlock_page(page);		unlock_page(page);
	return(err);		return err;
	}		}

	int hostfs_prepare_write(struct file file, struct page page,		int hostfs_prepare_write(struct file file, struct page page,
	@@ -485,7 +490,7 @@ int hostfs_prepare_write(struct file file, struct page page,
	err = 0;		err = 0;
	out:		out:
	kunmap(page);		kunmap(page);
	return(err);		return err;
	}		}

	int hostfs_commit_write(struct file file, struct page page, unsigned from,		int hostfs_commit_write(struct file file, struct page page, unsigned from,
	@@ -511,7 +516,7 @@ int hostfs_commit_write(struct file file, struct page page, unsigned from,
	inode->i_size = start;		inode->i_size = start;

	kunmap(page);		kunmap(page);
	return(err);		return err;
	}		}

	static const struct address_space_operations hostfs_aops = {		static const struct address_space_operations hostfs_aops = {
	@@ -569,7 +574,7 @@ static int init_inode(struct inode inode, struct dentry dentry)
	break;		break;
	}		}
	out:		out:
	return(err);		return err;
	}		}

	int hostfs_create(struct inode dir, struct dentry dentry, int mode,		int hostfs_create(struct inode dir, struct dentry dentry, int mode,
	@@ -607,12 +612,12 @@ int hostfs_create(struct inode dir, struct dentry dentry, int mode,
	HOSTFS_I(inode)->fd = fd;		HOSTFS_I(inode)->fd = fd;
	HOSTFS_I(inode)->mode = FMODE_READ \| FMODE_WRITE;		HOSTFS_I(inode)->mode = FMODE_READ \| FMODE_WRITE;
	d_instantiate(dentry, inode);		d_instantiate(dentry, inode);
	return(0);		return 0;

	out_put:		out_put:
	iput(inode);		iput(inode);
	out:		out:
	return(error);		return error;
	}		}

	struct dentry hostfs_lookup(struct inode ino, struct dentry *dentry,		struct dentry hostfs_lookup(struct inode ino, struct dentry *dentry,
	@@ -647,12 +652,12 @@ struct dentry hostfs_lookup(struct inode ino, struct dentry *dentry,

	d_add(dentry, inode);		d_add(dentry, inode);
	dentry->d_op = &hostfs_dentry_ops;		dentry->d_op = &hostfs_dentry_ops;
	return(NULL);		return NULL;

	out_put:		out_put:
	iput(inode);		iput(inode);
	out:		out:
	return(ERR_PTR(err));		return ERR_PTR(err);
	}		}

	static char inode_dentry_name(struct inode ino, struct dentry *dentry)		static char inode_dentry_name(struct inode ino, struct dentry *dentry)
	@@ -661,12 +666,13 @@ static char inode_dentry_name(struct inode ino, struct dentry *dentry)
	int len;		int len;

	file = inode_name(ino, dentry->d_name.len + 1);		file = inode_name(ino, dentry->d_name.len + 1);
	if(file == NULL) return(NULL);		if(file == NULL)
			return NULL;
	strcat(file, "/");		strcat(file, "/");
	len = strlen(file);		len = strlen(file);
	strncat(file, dentry->d_name.name, dentry->d_name.len);		strncat(file, dentry->d_name.name, dentry->d_name.len);
	file[len + dentry->d_name.len] = '\0';		file[len + dentry->d_name.len] = '\0';
	return(file);		return file;
	}		}

	int hostfs_link(struct dentry to, struct inode ino, struct dentry *from)		int hostfs_link(struct dentry to, struct inode ino, struct dentry *from)
	@@ -675,16 +681,16 @@ int hostfs_link(struct dentry to, struct inode ino, struct dentry *from)
	int err;		int err;

	if((from_name = inode_dentry_name(ino, from)) == NULL)		if((from_name = inode_dentry_name(ino, from)) == NULL)
	return(-ENOMEM);		return -ENOMEM;
	to_name = dentry_name(to, 0);		to_name = dentry_name(to, 0);
	if(to_name == NULL){		if(to_name == NULL){
	kfree(from_name);		kfree(from_name);
	return(-ENOMEM);		return -ENOMEM;
	}		}
	err = link_file(to_name, from_name);		err = link_file(to_name, from_name);
	kfree(from_name);		kfree(from_name);
	kfree(to_name);		kfree(to_name);
	return(err);		return err;
	}		}

	int hostfs_unlink(struct inode ino, struct dentry dentry)		int hostfs_unlink(struct inode ino, struct dentry dentry)
	@@ -692,13 +698,14 @@ int hostfs_unlink(struct inode ino, struct dentry dentry)
	char *file;		char *file;
	int err;		int err;

	if((file = inode_dentry_name(ino, dentry)) == NULL) return(-ENOMEM);		if((file = inode_dentry_name(ino, dentry)) == NULL)
			return -ENOMEM;
	if(append)		if(append)
	return(-EPERM);		return -EPERM;

	err = unlink_file(file);		err = unlink_file(file);
	kfree(file);		kfree(file);
	return(err);		return err;
	}		}

	int hostfs_symlink(struct inode ino, struct dentry dentry, const char *to)		int hostfs_symlink(struct inode ino, struct dentry dentry, const char *to)
	@@ -706,10 +713,11 @@ int hostfs_symlink(struct inode ino, struct dentry dentry, const char *to)
	char *file;		char *file;
	int err;		int err;

	if((file = inode_dentry_name(ino, dentry)) == NULL) return(-ENOMEM);		if((file = inode_dentry_name(ino, dentry)) == NULL)
			return -ENOMEM;
	err = make_symlink(file, to);		err = make_symlink(file, to);
	kfree(file);		kfree(file);
	return(err);		return err;
	}		}

	int hostfs_mkdir(struct inode ino, struct dentry dentry, int mode)		int hostfs_mkdir(struct inode ino, struct dentry dentry, int mode)
	@@ -717,10 +725,11 @@ int hostfs_mkdir(struct inode ino, struct dentry dentry, int mode)
	char *file;		char *file;
	int err;		int err;

	if((file = inode_dentry_name(ino, dentry)) == NULL) return(-ENOMEM);		if((file = inode_dentry_name(ino, dentry)) == NULL)
			return -ENOMEM;
	err = do_mkdir(file, mode);		err = do_mkdir(file, mode);
	kfree(file);		kfree(file);
	return(err);		return err;
	}		}

	int hostfs_rmdir(struct inode ino, struct dentry dentry)		int hostfs_rmdir(struct inode ino, struct dentry dentry)
	@@ -728,10 +737,11 @@ int hostfs_rmdir(struct inode ino, struct dentry dentry)
	char *file;		char *file;
	int err;		int err;

	if((file = inode_dentry_name(ino, dentry)) == NULL) return(-ENOMEM);		if((file = inode_dentry_name(ino, dentry)) == NULL)
			return -ENOMEM;
	err = do_rmdir(file);		err = do_rmdir(file);
	kfree(file);		kfree(file);
	return(err);		return err;
	}		}

	int hostfs_mknod(struct inode dir, struct dentry dentry, int mode, dev_t dev)		int hostfs_mknod(struct inode dir, struct dentry dentry, int mode, dev_t dev)
	@@ -764,14 +774,14 @@ int hostfs_mknod(struct inode dir, struct dentry dentry, int mode, dev_t dev)
	goto out_put;		goto out_put;

	d_instantiate(dentry, inode);		d_instantiate(dentry, inode);
	return(0);		return 0;

	out_free:		out_free:
	kfree(name);		kfree(name);
	out_put:		out_put:
	iput(inode);		iput(inode);
	out:		out:
	return(err);		return err;
	}		}

	int hostfs_rename(struct inode from_ino, struct dentry from,		int hostfs_rename(struct inode from_ino, struct dentry from,
	@@ -781,15 +791,15 @@ int hostfs_rename(struct inode from_ino, struct dentry from,
	int err;		int err;

	if((from_name = inode_dentry_name(from_ino, from)) == NULL)		if((from_name = inode_dentry_name(from_ino, from)) == NULL)
	return(-ENOMEM);		return -ENOMEM;
	if((to_name = inode_dentry_name(to_ino, to)) == NULL){		if((to_name = inode_dentry_name(to_ino, to)) == NULL){
	kfree(from_name);		kfree(from_name);
	return(-ENOMEM);		return -ENOMEM;
	}		}
	err = rename_file(from_name, to_name);		err = rename_file(from_name, to_name);
	kfree(from_name);		kfree(from_name);
	kfree(to_name);		kfree(to_name);
	return(err);		return err;
	}		}

	int hostfs_permission(struct inode ino, int desired, struct nameidata nd)		int hostfs_permission(struct inode ino, int desired, struct nameidata nd)
	@@ -801,7 +811,8 @@ int hostfs_permission(struct inode ino, int desired, struct nameidata nd)
	if (desired & MAY_WRITE) w = 1;		if (desired & MAY_WRITE) w = 1;
	if (desired & MAY_EXEC) x = 1;		if (desired & MAY_EXEC) x = 1;
	name = inode_name(ino, 0);		name = inode_name(ino, 0);
	if (name == NULL) return(-ENOMEM);		if (name == NULL)
			return -ENOMEM;

	if (S_ISCHR(ino->i_mode) \|\| S_ISBLK(ino->i_mode) \|\|		if (S_ISCHR(ino->i_mode) \|\| S_ISBLK(ino->i_mode) \|\|
	S_ISFIFO(ino->i_mode) \|\| S_ISSOCK(ino->i_mode))		S_ISFIFO(ino->i_mode) \|\| S_ISSOCK(ino->i_mode))
	@@ -865,20 +876,21 @@ int hostfs_setattr(struct dentry dentry, struct iattr attr)
	attrs.ia_valid \|= HOSTFS_ATTR_MTIME_SET;		attrs.ia_valid \|= HOSTFS_ATTR_MTIME_SET;
	}		}
	name = dentry_name(dentry, 0);		name = dentry_name(dentry, 0);
	if(name == NULL) return(-ENOMEM);		if(name == NULL)
			return -ENOMEM;
	err = set_attr(name, &attrs, fd);		err = set_attr(name, &attrs, fd);
	kfree(name);		kfree(name);
	if(err)		if(err)
	return(err);		return err;

	return(inode_setattr(dentry->d_inode, attr));		return inode_setattr(dentry->d_inode, attr);
	}		}

	int hostfs_getattr(struct vfsmount mnt, struct dentry dentry,		int hostfs_getattr(struct vfsmount mnt, struct dentry dentry,
	struct kstat *stat)		struct kstat *stat)
	{		{
	generic_fillattr(dentry->d_inode, stat);		generic_fillattr(dentry->d_inode, stat);
	return(0);		return 0;
	}		}

	static const struct inode_operations hostfs_iops = {		static const struct inode_operations hostfs_iops = {
	@@ -917,7 +929,8 @@ int hostfs_link_readpage(struct file file, struct page page)

	buffer = kmap(page);		buffer = kmap(page);
	name = inode_name(page->mapping->host, 0);		name = inode_name(page->mapping->host, 0);
	if(name == NULL) return(-ENOMEM);		if(name == NULL)
			return -ENOMEM;
	err = do_readlink(name, buffer, PAGE_CACHE_SIZE);		err = do_readlink(name, buffer, PAGE_CACHE_SIZE);
	kfree(name);		kfree(name);
	if(err == PAGE_CACHE_SIZE)		if(err == PAGE_CACHE_SIZE)
	@@ -930,7 +943,7 @@ int hostfs_link_readpage(struct file file, struct page page)
	}		}
	kunmap(page);		kunmap(page);
	unlock_page(page);		unlock_page(page);
	return(err);		return err;
	}		}

	static const struct address_space_operations hostfs_link_aops = {		static const struct address_space_operations hostfs_link_aops = {
	@@ -986,14 +999,14 @@ static int hostfs_fill_sb_common(struct super_block sb, void d, int silent)
	goto out;		goto out;
	}		}

	return(0);		return 0;

	out_put:		out_put:
	iput(root_inode);		iput(root_inode);
	out_free:		out_free:
	kfree(host_root_path);		kfree(host_root_path);
	out:		out:
	return(err);		return err;
	}		}

	static int hostfs_read_sb(struct file_system_type *type,		static int hostfs_read_sb(struct file_system_type *type,
	@@ -1013,7 +1026,7 @@ static struct file_system_type hostfs_type = {

	static int __init init_hostfs(void)		static int __init init_hostfs(void)
	{		{
	return(register_filesystem(&hostfs_type));		return register_filesystem(&hostfs_type);
	}		}

	static void __exit exit_hostfs(void)		static void __exit exit_hostfs(void)
	@@ -1024,14 +1037,3 @@ static void __exit exit_hostfs(void)
	module_init(init_hostfs)		module_init(init_hostfs)
	module_exit(exit_hostfs)		module_exit(exit_hostfs)
	MODULE_LICENSE("GPL");		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:
	*/

fs/hostfs/hostfs_user.c

+73 −68

Original line number	Original line	Diff line number	Diff line
	/*		/*
	* Copyright (C) 2000 Jeff Dike (jdike@karaya.com)		* Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
	* Licensed under the GPL		* Licensed under the GPL
	*/		*/

	@@ -27,9 +27,9 @@ int stat_file(const char path, unsigned long long inode_out, int *mode_out,

	if(fd >= 0) {		if(fd >= 0) {
	if (fstat64(fd, &buf) < 0)		if (fstat64(fd, &buf) < 0)
	return(-errno);		return -errno;
	} else if(lstat64(path, &buf) < 0) {		} else if(lstat64(path, &buf) < 0) {
	return(-errno);		return -errno;
	}		}

	if(inode_out != NULL) *inode_out = buf.st_ino;		if(inode_out != NULL) *inode_out = buf.st_ino;
	@@ -52,7 +52,7 @@ int stat_file(const char path, unsigned long long inode_out, int *mode_out,
	}		}
	if(blksize_out != NULL) *blksize_out = buf.st_blksize;		if(blksize_out != NULL) *blksize_out = buf.st_blksize;
	if(blocks_out != NULL) *blocks_out = buf.st_blocks;		if(blocks_out != NULL) *blocks_out = buf.st_blocks;
	return(0);		return 0;
	}		}

	int file_type(const char path, int maj, int *min)		int file_type(const char path, int maj, int *min)
	@@ -60,7 +60,7 @@ int file_type(const char path, int maj, int *min)
	struct stat64 buf;		struct stat64 buf;

	if(lstat64(path, &buf) < 0)		if(lstat64(path, &buf) < 0)
	return(-errno);		return -errno;
	/*We cannot pass rdev as is because glibc and the kernel disagree		/*We cannot pass rdev as is because glibc and the kernel disagree
	about its definition./		about its definition./
	if(maj != NULL)		if(maj != NULL)
	@@ -68,13 +68,13 @@ int file_type(const char path, int maj, int *min)
	if(min != NULL)		if(min != NULL)
	*min = minor(buf.st_rdev);		*min = minor(buf.st_rdev);

	if(S_ISDIR(buf.st_mode)) return(OS_TYPE_DIR);		if(S_ISDIR(buf.st_mode)) return OS_TYPE_DIR;
	else if(S_ISLNK(buf.st_mode)) return(OS_TYPE_SYMLINK);		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_ISCHR(buf.st_mode)) return OS_TYPE_CHARDEV;
	else if(S_ISBLK(buf.st_mode)) return(OS_TYPE_BLOCKDEV);		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_ISFIFO(buf.st_mode))return OS_TYPE_FIFO;
	else if(S_ISSOCK(buf.st_mode))return(OS_TYPE_SOCK);		else if(S_ISSOCK(buf.st_mode))return OS_TYPE_SOCK;
	else return(OS_TYPE_FILE);		else return OS_TYPE_FILE;
	}		}

	int access_file(char *path, int r, int w, int x)		int access_file(char *path, int r, int w, int x)
	@@ -84,8 +84,9 @@ int access_file(char *path, int r, int w, int x)
	if(r) mode = R_OK;		if(r) mode = R_OK;
	if(w) mode \|= W_OK;		if(w) mode \|= W_OK;
	if(x) mode \|= X_OK;		if(x) mode \|= X_OK;
	if(access(path, mode) != 0) return(-errno);		if(access(path, mode) != 0)
	else return(0);		return -errno;
			else return 0;
	}		}

	int open_file(char *path, int r, int w, int append)		int open_file(char *path, int r, int w, int append)
	@@ -103,8 +104,9 @@ int open_file(char *path, int r, int w, int append)
	if(append)		if(append)
	mode \|= O_APPEND;		mode \|= O_APPEND;
	fd = open64(path, mode);		fd = open64(path, mode);
	if(fd < 0) return(-errno);		if(fd < 0)
	else return(fd);		return -errno;
			else return fd;
	}		}

	void open_dir(char path, int *err_out)		void open_dir(char path, int *err_out)
	@@ -113,8 +115,9 @@ void open_dir(char path, int *err_out)

	dir = opendir(path);		dir = opendir(path);
	*err_out = errno;		*err_out = errno;
	if(dir == NULL) return(NULL);		if(dir == NULL)
	return(dir);		return NULL;
			return dir;
	}		}

	char read_dir(void stream, unsigned long long *pos,		char read_dir(void stream, unsigned long long *pos,
	@@ -125,11 +128,12 @@ char read_dir(void stream, unsigned long long *pos,

	seekdir(dir, *pos);		seekdir(dir, *pos);
	ent = readdir(dir);		ent = readdir(dir);
	if(ent == NULL) return(NULL);		if(ent == NULL)
			return NULL;
	*len_out = strlen(ent->d_name);		*len_out = strlen(ent->d_name);
	*ino_out = ent->d_ino;		*ino_out = ent->d_ino;
	*pos = telldir(dir);		*pos = telldir(dir);
	return(ent->d_name);		return ent->d_name;
	}		}

	int read_file(int fd, unsigned long long offset, char buf, int len)		int read_file(int fd, unsigned long long offset, char buf, int len)
	@@ -137,9 +141,10 @@ int read_file(int fd, unsigned long long offset, char buf, int len)
	int n;		int n;

	n = pread64(fd, buf, len, *offset);		n = pread64(fd, buf, len, *offset);
	if(n < 0) return(-errno);		if(n < 0)
			return -errno;
	*offset += n;		*offset += n;
	return(n);		return n;
	}		}

	int write_file(int fd, unsigned long long offset, const char buf, int len)		int write_file(int fd, unsigned long long offset, const char buf, int len)
	@@ -147,9 +152,10 @@ int write_file(int fd, unsigned long long offset, const char buf, int len)
	int n;		int n;

	n = pwrite64(fd, buf, len, *offset);		n = pwrite64(fd, buf, len, *offset);
	if(n < 0) return(-errno);		if(n < 0)
			return -errno;
	*offset += n;		*offset += n;
	return(n);		return n;
	}		}

	int lseek_file(int fd, long long offset, int whence)		int lseek_file(int fd, long long offset, int whence)
	@@ -158,8 +164,8 @@ int lseek_file(int fd, long long offset, int whence)

	ret = lseek64(fd, offset, whence);		ret = lseek64(fd, offset, whence);
	if(ret < 0)		if(ret < 0)
	return(-errno);		return -errno;
	return(0);		return 0;
	}		}

	int fsync_file(int fd, int datasync)		int fsync_file(int fd, int datasync)
	@@ -202,8 +208,8 @@ int file_create(char *name, int ur, int uw, int ux, int gr,
	mode \|= ox ? S_IXOTH : 0;		mode \|= ox ? S_IXOTH : 0;
	fd = open64(name, O_CREAT \| O_RDWR, mode);		fd = open64(name, O_CREAT \| O_RDWR, mode);
	if(fd < 0)		if(fd < 0)
	return(-errno);		return -errno;
	return(fd);		return fd;
	}		}

	int set_attr(const char file, struct hostfs_iattr attrs, int fd)		int set_attr(const char file, struct hostfs_iattr attrs, int fd)
	@@ -217,31 +223,31 @@ int set_attr(const char file, struct hostfs_iattr attrs, int fd)
	if (fchmod(fd, attrs->ia_mode) != 0)		if (fchmod(fd, attrs->ia_mode) != 0)
	return (-errno);		return (-errno);
	} else if (chmod(file, attrs->ia_mode) != 0) {		} else if (chmod(file, attrs->ia_mode) != 0) {
	return (-errno);		return -errno;
	}		}
	}		}
	if (attrs->ia_valid & HOSTFS_ATTR_UID) {		if (attrs->ia_valid & HOSTFS_ATTR_UID) {
	if (fd >= 0) {		if (fd >= 0) {
	if (fchown(fd, attrs->ia_uid, -1))		if (fchown(fd, attrs->ia_uid, -1))
	return (-errno);		return -errno;
	} else if(chown(file, attrs->ia_uid, -1)) {		} else if(chown(file, attrs->ia_uid, -1)) {
	return (-errno);		return -errno;
	}		}
	}		}
	if (attrs->ia_valid & HOSTFS_ATTR_GID) {		if (attrs->ia_valid & HOSTFS_ATTR_GID) {
	if (fd >= 0) {		if (fd >= 0) {
	if (fchown(fd, -1, attrs->ia_gid))		if (fchown(fd, -1, attrs->ia_gid))
	return (-errno);		return -errno;
	} else if (chown(file, -1, attrs->ia_gid)) {		} else if (chown(file, -1, attrs->ia_gid)) {
	return (-errno);		return -errno;
	}		}
	}		}
	if (attrs->ia_valid & HOSTFS_ATTR_SIZE) {		if (attrs->ia_valid & HOSTFS_ATTR_SIZE) {
	if (fd >= 0) {		if (fd >= 0) {
	if (ftruncate(fd, attrs->ia_size))		if (ftruncate(fd, attrs->ia_size))
	return (-errno);		return -errno;
	} else if (truncate(file, attrs->ia_size)) {		} else if (truncate(file, attrs->ia_size)) {
	return (-errno);		return -errno;
	}		}
	}		}

	@@ -271,9 +277,9 @@ int set_attr(const char file, struct hostfs_iattr attrs, int fd)

	if (fd >= 0) {		if (fd >= 0) {
	if (futimes(fd, times) != 0)		if (futimes(fd, times) != 0)
	return (-errno);		return -errno;
	} else if (utimes(file, times) != 0) {		} else if (utimes(file, times) != 0) {
	return (-errno);		return -errno;
	}		}
	}		}

	@@ -282,9 +288,10 @@ int set_attr(const char file, struct hostfs_iattr attrs, int fd)
	err = stat_file(file, NULL, NULL, NULL, NULL, NULL, NULL,		err = stat_file(file, NULL, NULL, NULL, NULL, NULL, NULL,
	&attrs->ia_atime, &attrs->ia_mtime, NULL,		&attrs->ia_atime, &attrs->ia_mtime, NULL,
	NULL, NULL, fd);		NULL, NULL, fd);
	if(err != 0) return(err);		if(err != 0)
			return err;
	}		}
	return(0);		return 0;
	}		}

	int make_symlink(const char from, const char to)		int make_symlink(const char from, const char to)
	@@ -292,8 +299,9 @@ int make_symlink(const char from, const char to)
	int err;		int err;

	err = symlink(to, from);		err = symlink(to, from);
	if(err) return(-errno);		if(err)
	return(0);		return -errno;
			return 0;
	}		}

	int unlink_file(const char *file)		int unlink_file(const char *file)
	@@ -301,8 +309,9 @@ int unlink_file(const char *file)
	int err;		int err;

	err = unlink(file);		err = unlink(file);
	if(err) return(-errno);		if(err)
	return(0);		return -errno;
			return 0;
	}		}

	int do_mkdir(const char *file, int mode)		int do_mkdir(const char *file, int mode)
	@@ -310,8 +319,9 @@ int do_mkdir(const char *file, int mode)
	int err;		int err;

	err = mkdir(file, mode);		err = mkdir(file, mode);
	if(err) return(-errno);		if(err)
	return(0);		return -errno;
			return 0;
	}		}

	int do_rmdir(const char *file)		int do_rmdir(const char *file)
	@@ -319,8 +329,9 @@ int do_rmdir(const char *file)
	int err;		int err;

	err = rmdir(file);		err = rmdir(file);
	if(err) return(-errno);		if(err)
	return(0);		return -errno;
			return 0;
	}		}

	int do_mknod(const char *file, int mode, unsigned int major, unsigned int minor)		int do_mknod(const char *file, int mode, unsigned int major, unsigned int minor)
	@@ -328,8 +339,9 @@ int do_mknod(const char *file, int mode, unsigned int major, unsigned int minor)
	int err;		int err;

	err = mknod(file, mode, makedev(major, minor));		err = mknod(file, mode, makedev(major, minor));
	if(err) return(-errno);		if(err)
	return(0);		return -errno;
			return 0;
	}		}

	int link_file(const char to, const char from)		int link_file(const char to, const char from)
	@@ -337,8 +349,9 @@ int link_file(const char to, const char from)
	int err;		int err;

	err = link(to, from);		err = link(to, from);
	if(err) return(-errno);		if(err)
	return(0);		return -errno;
			return 0;
	}		}

	int do_readlink(char file, char buf, int size)		int do_readlink(char file, char buf, int size)
	@@ -347,10 +360,10 @@ int do_readlink(char file, char buf, int size)

	n = readlink(file, buf, size);		n = readlink(file, buf, size);
	if(n < 0)		if(n < 0)
	return(-errno);		return -errno;
	if(n < size)		if(n < size)
	buf[n] = '\0';		buf[n] = '\0';
	return(n);		return n;
	}		}

	int rename_file(char from, char to)		int rename_file(char from, char to)
	@@ -358,8 +371,9 @@ int rename_file(char from, char to)
	int err;		int err;

	err = rename(from, to);		err = rename(from, to);
	if(err < 0) return(-errno);		if(err < 0)
	return(0);		return -errno;
			return 0;
	}		}

	int do_statfs(char root, long bsize_out, long long *blocks_out,		int do_statfs(char root, long bsize_out, long long *blocks_out,
	@@ -372,7 +386,9 @@ int do_statfs(char root, long bsize_out, long long *blocks_out,
	int err;		int err;

	err = statfs64(root, &buf);		err = statfs64(root, &buf);
	if(err < 0) return(-errno);		if(err < 0)
			return -errno;

	*bsize_out = buf.f_bsize;		*bsize_out = buf.f_bsize;
	*blocks_out = buf.f_blocks;		*blocks_out = buf.f_blocks;
	*bfree_out = buf.f_bfree;		*bfree_out = buf.f_bfree;
	@@ -388,16 +404,5 @@ int do_statfs(char root, long bsize_out, long long *blocks_out,
	spare_out[2] = buf.f_spare[2];		spare_out[2] = buf.f_spare[2];
	spare_out[3] = buf.f_spare[3];		spare_out[3] = buf.f_spare[3];
	spare_out[4] = buf.f_spare[4];		spare_out[4] = buf.f_spare[4];
	return(0);		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:
	*/