From: Valerie Aurora <valerie.aurora@gmail.com>
To: linux-fsdevel@vger.kernel.org, linux@vger.kernel.org
Cc: viro@zeniv.linux.org.uk, Valerie Aurora <vaurora@redhat.com>,
Hugh Dickins <hughd@google.com>,
linux-mm@kvack.org, Valerie Aurora <valerie.aurora@gmail.com>
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 [thread overview]
Message-ID: <1300845905-14433-16-git-send-email-valerie.aurora@gmail.com> (raw)
In-Reply-To: <1300845905-14433-1-git-send-email-valerie.aurora@gmail.com>
From: Valerie Aurora <vaurora@redhat.com>
Now that we have full union lookup support, lookup the true d_type and
d_ino of a fallthru.
Cc: Hugh Dickins <hughd@google.com>
Cc: linux-mm@kvack.org
Signed-off-by: Valerie Aurora <valerie.aurora@gmail.com>
---
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
next prev parent reply other threads:[~2011-03-23 2:05 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-23 2:04 [PATCH 44/74] union-mount: Temporarily disable some syscalls Valerie Aurora
2011-03-23 2:04 ` [PATCH 45/74] union-mount: Basic infrastructure of __lookup_union() Valerie Aurora
2011-03-23 2:04 ` [PATCH 46/74] union-mount: Process negative dentries in __lookup_union() Valerie Aurora
2011-03-23 2:04 ` [PATCH 47/74] union-mount: Return files found in lower layers " Valerie Aurora
2011-03-23 2:04 ` [PATCH 48/74] union-mount: Build union stack " Valerie Aurora
2011-03-23 2:04 ` [PATCH 49/74] union-mount: Follow mount " Valerie Aurora
2011-03-23 2:04 ` [PATCH 50/74] union-mount: Add lookup_union() Valerie Aurora
2011-03-23 2:04 ` [PATCH 51/74] union-mount: Add do_lookup_union() wrapper for __lookup_union() Valerie Aurora
2011-03-23 2:04 ` [PATCH 52/74] union-mount: Call union lookup functions in lookup path Valerie Aurora
2011-03-23 2:04 ` [PATCH 53/74] union-mount: Create whiteout on unlink() Valerie Aurora
2011-03-23 2:04 ` [PATCH 54/74] union-mount: Create whiteout on rmdir() Valerie Aurora
2011-03-23 2:04 ` [PATCH 55/74] union-mount: Set opaque flag on new directories in unioned file systems Valerie Aurora
2011-03-23 2:04 ` [PATCH 56/74] union-mount: Copy up directory entries on first readdir() Valerie Aurora
2011-03-23 2:04 ` [PATCH 57/74] union-mount: Add generic_readdir_fallthru() helper Valerie Aurora
2011-03-23 2:04 ` [PATCH 58/74] fallthru: ext2 support for lookup of d_type/d_ino in fallthrus Valerie Aurora
2011-03-23 2:04 ` Valerie Aurora [this message]
2011-03-23 2:04 ` [PATCH 60/74] fallthru: jffs2 " Valerie Aurora
2011-03-23 2:04 ` [PATCH 61/74] VFS: Split inode_permission() and create path_permission() Valerie Aurora
2011-03-23 2:04 ` [PATCH 62/74] VFS: Create user_path_nd() to lookup both parent and target Valerie Aurora
2011-03-23 2:04 ` [PATCH 63/74] union-mount: In-kernel file copyup routines Valerie Aurora
2011-03-23 2:04 ` [PATCH 64/74] union-mount: Implement union-aware access()/faccessat() Valerie Aurora
2011-03-23 2:04 ` [PATCH 65/74] union-mount: Implement union-aware link() Valerie Aurora
2011-03-23 2:04 ` [PATCH 66/74] union-mount: Implement union-aware rename() Valerie Aurora
2011-03-23 2:04 ` [PATCH 67/74] union-mount: Implement union-aware writable open() Valerie Aurora
2011-03-23 2:04 ` [PATCH 68/74] union-mount: Implement union-aware chown() Valerie Aurora
2011-03-23 2:05 ` [PATCH 69/74] union-mount: Implement union-aware truncate() Valerie Aurora
2011-03-23 2:05 ` [PATCH 70/74] union-mount: Implement union-aware chmod()/fchmodat() Valerie Aurora
2011-03-23 2:05 ` [PATCH 71/74] union-mount: Implement union-aware lchown() Valerie Aurora
2011-03-23 2:05 ` [PATCH 72/74] union-mount: Implement union-aware utimensat() Valerie Aurora
2011-03-23 2:05 ` [PATCH 73/74] union-mount: Implement union-aware setxattr() Valerie Aurora
2011-03-23 2:05 ` [PATCH 74/74] union-mount: Implement union-aware lsetxattr() Valerie Aurora
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1300845905-14433-16-git-send-email-valerie.aurora@gmail.com \
--to=valerie.aurora@gmail.com \
--cc=hughd@google.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux@vger.kernel.org \
--cc=vaurora@redhat.com \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).