diff --git a/[refs] b/[refs] index 9f46225ba8c4..3a2a529b0ec9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d28c91740ae2cd1d963f9e4e3889789894cb6d52 +refs/heads/master: 80a067801d8cc9384f17991b90811f87ceab8225 diff --git a/trunk/fs/openpromfs/inode.c b/trunk/fs/openpromfs/inode.c index 26f44e0074ec..99c0bc37ba09 100644 --- a/trunk/fs/openpromfs/inode.c +++ b/trunk/fs/openpromfs/inode.c @@ -262,7 +262,7 @@ static struct dentry *openpromfs_lookup(struct inode *dir, struct dentry *dentry static int openpromfs_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 op_inode_info *oi = OP_I(inode); struct device_node *dp = oi->u.node; struct device_node *child;