aboutsummaryrefslogtreecommitdiffstats
path: root/fs/coda/dir.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/coda/dir.c')
-rw-r--r--fs/coda/dir.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/coda/dir.c b/fs/coda/dir.c
index 0102b28a15fb..0c6f7f3b3dd7 100644
--- a/fs/coda/dir.c
+++ b/fs/coda/dir.c
@@ -441,7 +441,7 @@ static int coda_rename(struct inode *old_dir, struct dentry *old_dentry,
441/* file operations for directories */ 441/* file operations for directories */
442int coda_readdir(struct file *coda_file, void *dirent, filldir_t filldir) 442int coda_readdir(struct file *coda_file, void *dirent, filldir_t filldir)
443{ 443{
444 struct dentry *coda_dentry = coda_file->f_dentry; 444 struct dentry *coda_dentry = coda_file->f_path.dentry;
445 struct coda_file_info *cfi; 445 struct coda_file_info *cfi;
446 struct file *host_file; 446 struct file *host_file;
447 struct inode *host_inode; 447 struct inode *host_inode;
@@ -453,7 +453,7 @@ int coda_readdir(struct file *coda_file, void *dirent, filldir_t filldir)
453 453
454 coda_vfs_stat.readdir++; 454 coda_vfs_stat.readdir++;
455 455
456 host_inode = host_file->f_dentry->d_inode; 456 host_inode = host_file->f_path.dentry->d_inode;
457 mutex_lock(&host_inode->i_mutex); 457 mutex_lock(&host_inode->i_mutex);
458 host_file->f_pos = coda_file->f_pos; 458 host_file->f_pos = coda_file->f_pos;
459 459
@@ -544,14 +544,14 @@ static int coda_venus_readdir(struct file *filp, filldir_t filldir,
544 /* catch truncated reads */ 544 /* catch truncated reads */
545 if (ret < vdir_size || ret < vdir_size + vdir->d_namlen) { 545 if (ret < vdir_size || ret < vdir_size + vdir->d_namlen) {
546 printk("coda_venus_readdir: short read: %ld\n", 546 printk("coda_venus_readdir: short read: %ld\n",
547 filp->f_dentry->d_inode->i_ino); 547 filp->f_path.dentry->d_inode->i_ino);
548 ret = -EBADF; 548 ret = -EBADF;
549 break; 549 break;
550 } 550 }
551 /* validate whether the directory file actually makes sense */ 551 /* validate whether the directory file actually makes sense */
552 if (vdir->d_reclen < vdir_size + vdir->d_namlen) { 552 if (vdir->d_reclen < vdir_size + vdir->d_namlen) {
553 printk("coda_venus_readdir: Invalid dir: %ld\n", 553 printk("coda_venus_readdir: Invalid dir: %ld\n",
554 filp->f_dentry->d_inode->i_ino); 554 filp->f_path.dentry->d_inode->i_ino);
555 ret = -EBADF; 555 ret = -EBADF;
556 break; 556 break;
557 } 557 }