[PATCH] struct path: convert coda
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>
This commit is contained in:
committed by
Linus Torvalds
parent
a7113a9662
commit
d4176d326d
@ -441,7 +441,7 @@ static int coda_rename(struct inode *old_dir, struct dentry *old_dentry,
|
||||
/* file operations for directories */
|
||||
int coda_readdir(struct file *coda_file, void *dirent, filldir_t filldir)
|
||||
{
|
||||
struct dentry *coda_dentry = coda_file->f_dentry;
|
||||
struct dentry *coda_dentry = coda_file->f_path.dentry;
|
||||
struct coda_file_info *cfi;
|
||||
struct file *host_file;
|
||||
struct inode *host_inode;
|
||||
@ -453,7 +453,7 @@ int coda_readdir(struct file *coda_file, void *dirent, filldir_t filldir)
|
||||
|
||||
coda_vfs_stat.readdir++;
|
||||
|
||||
host_inode = host_file->f_dentry->d_inode;
|
||||
host_inode = host_file->f_path.dentry->d_inode;
|
||||
mutex_lock(&host_inode->i_mutex);
|
||||
host_file->f_pos = coda_file->f_pos;
|
||||
|
||||
@ -544,14 +544,14 @@ static int coda_venus_readdir(struct file *filp, filldir_t filldir,
|
||||
/* catch truncated reads */
|
||||
if (ret < vdir_size || ret < vdir_size + vdir->d_namlen) {
|
||||
printk("coda_venus_readdir: short read: %ld\n",
|
||||
filp->f_dentry->d_inode->i_ino);
|
||||
filp->f_path.dentry->d_inode->i_ino);
|
||||
ret = -EBADF;
|
||||
break;
|
||||
}
|
||||
/* validate whether the directory file actually makes sense */
|
||||
if (vdir->d_reclen < vdir_size + vdir->d_namlen) {
|
||||
printk("coda_venus_readdir: Invalid dir: %ld\n",
|
||||
filp->f_dentry->d_inode->i_ino);
|
||||
filp->f_path.dentry->d_inode->i_ino);
|
||||
ret = -EBADF;
|
||||
break;
|
||||
}
|
||||
|
Reference in New Issue
Block a user