aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJosef Sipek <jsipek@fsl.cs.sunysb.edu>2006-12-08 05:37:05 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-08 11:28:45 -0500
commit680b0da9b10d97ddf3c325bf03ae8425ebf4fdec (patch)
tree6ab904cee60e7babffb7f39c2a38e1c9801f295c /fs
parentf44ea03102a021b9c36cc82c7b6312cd23f23b3d (diff)
[PATCH] struct path: convert hostfs
Signed-off-by: Josef Sipek <jsipek@fsl.cs.sunysb.edu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/hostfs/hostfs_kern.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c
index b6bd33ca3731..1e6fc3799876 100644
--- a/fs/hostfs/hostfs_kern.c
+++ b/fs/hostfs/hostfs_kern.c
@@ -35,7 +35,7 @@ static inline struct hostfs_inode_info *HOSTFS_I(struct inode *inode)
35 return(list_entry(inode, struct hostfs_inode_info, vfs_inode)); 35 return(list_entry(inode, struct hostfs_inode_info, vfs_inode));
36} 36}
37 37
38#define FILE_HOSTFS_I(file) HOSTFS_I((file)->f_dentry->d_inode) 38#define FILE_HOSTFS_I(file) HOSTFS_I((file)->f_path.dentry->d_inode)
39 39
40int hostfs_d_delete(struct dentry *dentry) 40int hostfs_d_delete(struct dentry *dentry)
41{ 41{
@@ -325,7 +325,7 @@ int hostfs_readdir(struct file *file, void *ent, filldir_t filldir)
325 unsigned long long next, ino; 325 unsigned long long next, ino;
326 int error, len; 326 int error, len;
327 327
328 name = dentry_name(file->f_dentry, 0); 328 name = dentry_name(file->f_path.dentry, 0);
329 if(name == NULL) return(-ENOMEM); 329 if(name == NULL) return(-ENOMEM);
330 dir = open_dir(name, &error); 330 dir = open_dir(name, &error);
331 kfree(name); 331 kfree(name);
@@ -366,7 +366,7 @@ int hostfs_file_open(struct inode *ino, struct file *file)
366 if(w) 366 if(w)
367 r = 1; 367 r = 1;
368 368
369 name = dentry_name(file->f_dentry, 0); 369 name = dentry_name(file->f_path.dentry, 0);
370 if(name == NULL) 370 if(name == NULL)
371 return(-ENOMEM); 371 return(-ENOMEM);
372 372