From mboxrd@z Thu Jan 1 00:00:00 1970 From: Valerie Aurora Subject: [PATCH 59/74] fallthru: tmpfs support for lookup of d_type/d_ino in fallthrus Date: Tue, 22 Mar 2011 19:04:50 -0700 Message-ID: <1300845905-14433-16-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 , Hugh Dickins , linux-mm@kvack.org, Valerie Aurora To: linux-fsdevel@vger.kernel.org, linux@vger.kernel.org Return-path: Received: from mail-yi0-f46.google.com ([209.85.218.46]:45618 "EHLO mail-yi0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754908Ab1CWCF6 (ORCPT ); Tue, 22 Mar 2011 22:05:58 -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. Cc: Hugh Dickins Cc: linux-mm@kvack.org Signed-off-by: Valerie Aurora --- fs/libfs.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/fs/libfs.c b/fs/libfs.c index a73423d..8453c75 100644 --- a/fs/libfs.c +++ b/fs/libfs.c @@ -132,6 +132,7 @@ int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir) ino_t ino; char d_type; int i = filp->f_pos; + int err = 0; switch (i) { case 0: @@ -161,9 +162,13 @@ int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir) spin_unlock(&dcache_lock); if (d_is_fallthru(next)) { - /* XXX placeholder until generic_readdir_fallthru() arrives */ - ino = 1; - d_type = DT_UNKNOWN; + /* On tmpfs, should only fail with ENOMEM, EIO, etc. */ + err = generic_readdir_fallthru(filp->f_path.dentry, + next->d_name.name, + next->d_name.len, + &ino, &d_type); + if (err) + return err; } else { ino = next->d_inode->i_ino; d_type = dt_type(next->d_inode); -- 1.7.0.4