-/*
+/*
* Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com)
* Licensed under the GPL
*
#include <linux/buffer_head.h>
#include <linux/root_dev.h>
#include <linux/statfs.h>
+#include <linux/kdev_t.h>
#include <asm/uaccess.h>
#include "hostfs.h"
#include "kern_util.h"
static struct inode_operations hostfs_dir_iops;
static struct address_space_operations hostfs_link_aops;
+#ifndef MODULE
static int __init hostfs_args(char *options, int *add)
{
char *ptr;
" The only flag currently supported is 'append', which specifies that all\n"
" files opened by hostfs will be opened in append mode.\n\n"
);
+#endif
static char *dentry_name(struct dentry *dentry, int extra)
{
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);
while(parent->d_parent != parent){
len -= parent->d_name.len + 1;
name[len] = '/';
- strncpy(&name[len + 1], parent->d_name.name,
+ strncpy(&name[len + 1], parent->d_name.name,
parent->d_name.len);
parent = parent->d_parent;
}
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,
+ 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)
+ if(err)
return(err);
ino->i_ino = i_ino;
*/
if(list_empty(&ino->i_dentry))
goto out;
-
+
err = -ENOMEM;
name = inode_name(ino, 0);
- if(name == NULL)
+ if(name == NULL)
goto out;
- if(file_type(name, NULL) == OS_TYPE_SYMLINK){
+ if(file_type(name, NULL, 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:
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),
+ &f_ffree, &sf->f_fsid, sizeof(sf->f_fsid),
&sf->f_namelen, sf->f_spare);
if(err) return(err);
sf->f_blocks = f_blocks;
struct hostfs_inode_info *hi;
hi = kmalloc(sizeof(*hi), GFP_KERNEL);
- if(hi == NULL)
+ if(hi == NULL)
return(NULL);
*hi = ((struct hostfs_inode_info) { .host_filename = NULL,
return(&hi->vfs_inode);
}
+static void hostfs_delete_inode(struct inode *inode)
+{
+ if(HOSTFS_I(inode)->fd != -1) {
+ close_file(&HOSTFS_I(inode)->fd);
+ HOSTFS_I(inode)->fd = -1;
+ }
+ clear_inode(inode);
+}
+
static void hostfs_destroy_inode(struct inode *inode)
{
- if(HOSTFS_I(inode)->host_filename)
+ if(HOSTFS_I(inode)->host_filename)
kfree(HOSTFS_I(inode)->host_filename);
- if(HOSTFS_I(inode)->fd != -1)
+ /*XXX: This should not happen, probably. The check is here for
+ * additional safety.*/
+ if(HOSTFS_I(inode)->fd != -1) {
close_file(&HOSTFS_I(inode)->fd);
+ printk(KERN_DEBUG "Closing host fd in .destroy_inode\n");
+ }
kfree(HOSTFS_I(inode));
}
read_inode(inode);
}
-static struct super_operations hostfs_sbops = {
+static struct super_operations hostfs_sbops = {
.alloc_inode = hostfs_alloc_inode,
+ .drop_inode = generic_delete_inode,
+ .delete_inode = hostfs_delete_inode,
.destroy_inode = hostfs_destroy_inode,
.read_inode = hostfs_read_inode,
.statfs = hostfs_statfs,
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,
+ error = (*filldir)(ent, name, len, file->f_pos,
ino, DT_UNKNOWN);
if(error) break;
file->f_pos = next;
}
HOSTFS_I(ino)->mode |= mode;
- if(HOSTFS_I(ino)->mode & FMODE_READ)
+ if(HOSTFS_I(ino)->mode & FMODE_READ)
r = 1;
- if(HOSTFS_I(ino)->mode & FMODE_WRITE)
+ if(HOSTFS_I(ino)->mode & FMODE_WRITE)
w = 1;
- if(w)
+ if(w)
r = 1;
name = dentry_name(file->f_dentry, 0);
- if(name == NULL)
+ if(name == NULL)
return(-ENOMEM);
fd = open_file(name, r, w, append);
inode->i_size = base;
if (PageError(page))
- ClearPageError(page);
+ ClearPageError(page);
err = 0;
- out:
+ out:
kunmap(page);
unlock_page(page);
- return err;
+ return err;
}
int hostfs_readpage(struct file *file, struct page *page)
return(err);
}
-int hostfs_prepare_write(struct file *file, struct page *page,
+int hostfs_prepare_write(struct file *file, struct page *page,
unsigned int from, unsigned int to)
{
char *buffer;
start += to;
err = read_file(FILE_HOSTFS_I(file)->fd, &start, buffer + to,
PAGE_CACHE_SIZE - to);
- if(err < 0) goto out;
+ if(err < 0) goto out;
}
err = 0;
out:
start = (long long) (page->index << PAGE_CACHE_SHIFT) + from;
buffer = kmap(page);
- err = write_file(FILE_HOSTFS_I(file)->fd, &start, buffer + from,
+ err = write_file(FILE_HOSTFS_I(file)->fd, &start, buffer + from,
to - from);
if(err > 0) err = 0;
if(!err && (start > inode->i_size))
static int init_inode(struct inode *inode, struct dentry *dentry)
{
char *name;
- int type, err = -ENOMEM, rdev;
+ int type, err = -ENOMEM;
+ int maj, min;
+ dev_t rdev = 0;
if(dentry){
name = dentry_name(dentry, 0);
if(name == NULL)
goto out;
- type = file_type(name, &rdev);
+ type = file_type(name, &maj, &min);
+ /*Reencode maj and min with the kernel encoding.*/
+ rdev = MKDEV(maj, min);
kfree(name);
}
else type = OS_TYPE_DIR;
if(type == OS_TYPE_DIR) inode->i_fop = &hostfs_dir_fops;
else inode->i_fop = &hostfs_file_fops;
- if(type == OS_TYPE_SYMLINK)
+ if(type == OS_TYPE_SYMLINK)
inode->i_mapping->a_ops = &hostfs_link_aops;
else inode->i_mapping->a_ops = &hostfs_aops;
return(err);
}
-int hostfs_create(struct inode *dir, struct dentry *dentry, int mode,
+int hostfs_create(struct inode *dir, struct dentry *dentry, int mode,
struct nameidata *nd)
{
struct inode *inode;
if(inode == NULL) goto out;
error = init_inode(inode, dentry);
- if(error)
+ 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,
+ 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)
+ if(fd < 0)
error = fd;
else error = read_name(inode, name);
return(error);
}
-struct dentry *hostfs_lookup(struct inode *ino, struct dentry *dentry,
+struct dentry *hostfs_lookup(struct inode *ino, struct dentry *dentry,
struct nameidata *nd)
{
struct inode *inode;
err = -ENOMEM;
inode = iget(ino->i_sb, 0);
- if(inode == NULL)
+ if(inode == NULL)
goto out;
-
+
err = init_inode(inode, dentry);
- if(err)
+ if(err)
goto out_put;
err = -ENOMEM;
char *from_name, *to_name;
int err;
- if((from_name = inode_dentry_name(ino, from)) == NULL)
+ if((from_name = inode_dentry_name(ino, from)) == NULL)
return(-ENOMEM);
to_name = dentry_name(to, 0);
if(to_name == NULL){
struct inode *inode;
char *name;
int err = -ENOMEM;
-
+
inode = iget(dir->i_sb, 0);
- if(inode == NULL)
+ if(inode == NULL)
goto out;
err = init_inode(inode, dentry);
- if(err)
+ if(err)
goto out_put;
err = -ENOMEM;
struct hostfs_iattr attrs;
char *name;
int err;
-
- if(append)
+
+ if(append)
attr->ia_valid &= ~ATTR_SIZE;
attrs.ia_valid = 0;
attrs.ia_mode = attr->ia_mode;
}
if(attr->ia_valid & ATTR_UID){
- if((dentry->d_inode->i_sb->s_dev == ROOT_DEV) &&
+ 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) &&
+ if((dentry->d_inode->i_sb->s_dev == ROOT_DEV) &&
(attr->ia_gid == 0))
attr->ia_gid = getuid();
attrs.ia_valid |= HOSTFS_ATTR_GID;
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)
{
generic_fillattr(dentry->d_inode, stat);
sb->s_magic = HOSTFS_SUPER_MAGIC;
sb->s_op = &hostfs_sbops;
- if((data == NULL) || (*data == '\0'))
+ if((data == NULL) || (*data == '\0'))
data = root_ino;
err = -ENOMEM;
name = kmalloc(strlen(data) + 1, GFP_KERNEL);
- if(name == NULL)
+ if(name == NULL)
goto out;
strcpy(name, data);
git://git.onelab.eu / linux-2.6.git / blobdiff