From 579943def6748183c2dfeaaac582b1e1a9a87fa5 Mon Sep 17 00:00:00 2001 From: Josef Sipek Date: Fri, 8 Dec 2006 02:37:04 -0800 Subject: [PATCH] --- yaml --- r: 43567 b: refs/heads/master c: c528896004793065b5ffd710e1cd844603ad8518 h: refs/heads/master i: 43565: 1707023d92025a99090d90edfba51c8e580d5e99 43563: f7eb20081a6d50db84510b18420fbca538dfbbb7 43559: 1b8f26847b91d6fc38be1e47b7252c8134a79ed1 43551: 24ff7c872559c32370117b85215a090a02dbab80 v: v3 --- [refs] | 2 +- trunk/fs/hfs/dir.c | 2 +- trunk/fs/hfs/inode.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 909c720b1fa4..ea62de18dad9 100644 --- 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 index 37d681b4f216..e2e0358da335 100644 --- 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 index 02f5573e0349..5cb7f8fee8d6 100644 --- 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);