From mboxrd@z Thu Jan 1 00:00:00 1970 From: Valerie Aurora Subject: [PATCH 58/74] fallthru: ext2 support for lookup of d_type/d_ino in fallthrus Date: Tue, 22 Mar 2011 19:04:49 -0700 Message-ID: <1300845905-14433-15-git-send-email-valerie.aurora@gmail.com> References: <1300845905-14433-1-git-send-email-valerie.aurora@gmail.com> Cc: viro@zeniv.linux.org.uk, Valerie Aurora , Valerie Aurora To: linux-fsdevel@vger.kernel.org, linux@vger.kernel.org Return-path: Received: from mail-gx0-f174.google.com ([209.85.161.174]:48320 "EHLO mail-gx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754932Ab1CWCF4 (ORCPT ); Tue, 22 Mar 2011 22:05:56 -0400 In-Reply-To: <1300845905-14433-1-git-send-email-valerie.aurora@gmail.com> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: From: Valerie Aurora Now that we have full union lookup support, lookup the true d_type and d_ino of a fallthru. Signed-off-by: Valerie Aurora --- fs/ext2/dir.c | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/fs/ext2/dir.c b/fs/ext2/dir.c index daff471..145d9eb 100644 --- a/fs/ext2/dir.c +++ b/fs/ext2/dir.c @@ -352,15 +352,21 @@ ext2_readdir (struct file * filp, void * dirent, filldir_t filldir) } } else if (de->file_type == EXT2_FT_FALLTHRU) { int over; + unsigned char d_type = DT_UNKNOWN; + ino_t ino; + int err; offset = (char *)de - kaddr; - /* XXX placeholder until generic_readdir_fallthru() arrives */ - over = filldir(dirent, de->name, de->name_len, - (n<f_path.dentry, de->name, + de->name_len, &ino, &d_type); + if (!err) { + over = filldir(dirent, de->name, de->name_len, + (n<f_pos += ext2_rec_len_from_disk(de->rec_len); -- 1.7.0.4