---

yaml --- r: 43567 b: refs/heads/master c: c528896 h: refs/heads/master i: 43565: 1707023 43563: f7eb200 43559: 1b8f268 43551: 24ff7c8 v: v3
git-mirror · Dec 8, 2006 · 579943d · 579943d
1 parent 73fc4ab
commit 579943d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 81454098f7c54118d290cd503bda2a41e3ac43fb
+refs/heads/master: c528896004793065b5ffd710e1cd844603ad8518
diff --git a/trunk/fs/hfs/dir.c b/trunk/fs/hfs/dir.c
@@ -53,7 +53,7 @@ static struct dentry *hfs_lookup(struct inode *dir, struct dentry *dentry,
  */
 static int hfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
 {
-	struct inode *inode = filp->f_dentry->d_inode;
+	struct inode *inode = filp->f_path.dentry->d_inode;
 	struct super_block *sb = inode->i_sb;
 	int len, err;
 	char strbuf[HFS_MAX_NAMELEN];

diff --git a/trunk/fs/hfs/inode.c b/trunk/fs/hfs/inode.c
@@ -102,7 +102,7 @@ static ssize_t hfs_direct_IO(int rw, struct kiocb *iocb,
 		const struct iovec *iov, loff_t offset, unsigned long nr_segs)
 {
 	struct file *file = iocb->ki_filp;
-	struct inode *inode = file->f_dentry->d_inode->i_mapping->host;
+	struct inode *inode = file->f_path.dentry->d_inode->i_mapping->host;
 
 	return blockdev_direct_IO(rw, iocb, inode, inode->i_sb->s_bdev, iov,
 				  offset, nr_segs, hfs_get_block, NULL);