From 0075d49d7a7933a14b296914a6f94373ea4615c8 Mon Sep 17 00:00:00 2001 From: Josef Sipek Date: Fri, 8 Dec 2006 02:37:16 -0800 Subject: [PATCH] --- yaml --- r: 43583 b: refs/heads/master c: ec2e203c8297d576c74a101cebd657bc1f180dd1 h: refs/heads/master i: 43581: 78acc3de893e11fb73a0c49a64b0b448c6310844 43579: 3316f57e39a11625e40a903c7c008c6087552a75 43575: 1b86217392a9916290ff49c1ce171d03662aa2bb 43567: 579943def6748183c2dfeaaac582b1e1a9a87fa5 43551: 24ff7c872559c32370117b85215a090a02dbab80 43519: 8519d9091ae15a5aadd8a62cfdd848f6962044e7 v: v3 --- [refs] | 2 +- trunk/fs/jffs2/dir.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c8d16da04b63..b2574d25c347 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4d832d460e13dd9c2cc93739ac0fd75bd8645e93 +refs/heads/master: ec2e203c8297d576c74a101cebd657bc1f180dd1 diff --git a/trunk/fs/jffs2/dir.c b/trunk/fs/jffs2/dir.c index 9def6adf4a5d..da6034d50718 100644 --- a/trunk/fs/jffs2/dir.c +++ b/trunk/fs/jffs2/dir.c @@ -123,11 +123,11 @@ static int jffs2_readdir(struct file *filp, void *dirent, filldir_t filldir) { struct jffs2_inode_info *f; struct jffs2_sb_info *c; - struct inode *inode = filp->f_dentry->d_inode; + struct inode *inode = filp->f_path.dentry->d_inode; struct jffs2_full_dirent *fd; unsigned long offset, curofs; - D1(printk(KERN_DEBUG "jffs2_readdir() for dir_i #%lu\n", filp->f_dentry->d_inode->i_ino)); + D1(printk(KERN_DEBUG "jffs2_readdir() for dir_i #%lu\n", filp->f_path.dentry->d_inode->i_ino)); f = JFFS2_INODE_INFO(inode); c = JFFS2_SB_INFO(inode->i_sb); @@ -141,7 +141,7 @@ static int jffs2_readdir(struct file *filp, void *dirent, filldir_t filldir) offset++; } if (offset == 1) { - unsigned long pino = parent_ino(filp->f_dentry); + unsigned long pino = parent_ino(filp->f_path.dentry); D1(printk(KERN_DEBUG "Dirent 1: \"..\", ino #%lu\n", pino)); if (filldir(dirent, "..", 2, 1, pino, DT_DIR) < 0) goto out;