Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 43569
b: refs/heads/master
c: 680b0da
h: refs/heads/master
i:
  43567: 579943d
v: v3
  • Loading branch information
Josef Sipek authored and Linus Torvalds committed Dec 8, 2006
1 parent b83dfbe commit 3ddc77a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f44ea03102a021b9c36cc82c7b6312cd23f23b3d
refs/heads/master: 680b0da9b10d97ddf3c325bf03ae8425ebf4fdec
6 changes: 3 additions & 3 deletions trunk/fs/hostfs/hostfs_kern.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ 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)
#define FILE_HOSTFS_I(file) HOSTFS_I((file)->f_path.dentry->d_inode)

int hostfs_d_delete(struct dentry *dentry)
{
Expand Down Expand Up @@ -325,7 +325,7 @@ int hostfs_readdir(struct file *file, void *ent, filldir_t filldir)
unsigned long long next, ino;
int error, len;

name = dentry_name(file->f_dentry, 0);
name = dentry_name(file->f_path.dentry, 0);
if(name == NULL) return(-ENOMEM);
dir = open_dir(name, &error);
kfree(name);
Expand Down Expand Up @@ -366,7 +366,7 @@ int hostfs_file_open(struct inode *ino, struct file *file)
if(w)
r = 1;

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

Expand Down

0 comments on commit 3ddc77a

Please sign in to comment.