From: Valerie Aurora <vaurora@xxxxxxxxxx> Now that we have full union lookup support, lookup the true d_type and d_ino of a fallthru. Original-author: Valerie Aurora <vaurora@xxxxxxxxxx> Signed-off-by: David Howells <dhowells@xxxxxxxxxx> --- fs/jffs2/dir.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/fs/jffs2/dir.c b/fs/jffs2/dir.c index e294f1d..ce4c393 100644 --- a/fs/jffs2/dir.c +++ b/fs/jffs2/dir.c @@ -168,9 +168,14 @@ static int jffs2_readdir(struct file *filp, void *dirent, filldir_t filldir) continue; } if (fd->type == JFFS2_DT_FALLTHRU) { - /* XXX placeholder until generic_readdir_fallthru() arrives */ - ino = 1; - d_type = DT_UNKNOWN; + int err; + err = generic_readdir_fallthru(filp->f_path.dentry, fd->name, strlen(fd->name), + &ino, &d_type); + if (err) { + D2(printk(KERN_DEBUG "Skipping fallthru dirent \"%s\"\n", fd->name)); + offset++; + continue; + } } else if (!fd->ino && (fd->type != DT_WHT)) { D2(printk(KERN_DEBUG "Skipping deletion dirent \"%s\"\n", fd->name)); offset++; -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html