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>
Cc: Hugh Dickins <hughd@xxxxxxxxxx>
Cc: linux-mm@xxxxxxxxx
---
fs/libfs.c | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/fs/libfs.c b/fs/libfs.c
index 43f1ac2..bd9388f 100644
--- a/fs/libfs.c
+++ b/fs/libfs.c
@@ -143,6 +143,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:
@@ -177,9 +178,13 @@ int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir)
spin_unlock(&next->d_lock);
spin_unlock(&dentry->d_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);
--
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
