summaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/dir.c
diff options
context:
space:
mode:
authorMark Fasheh <mark.fasheh@oracle.com>2007-09-10 17:50:51 -0700
committerMark Fasheh <mark.fasheh@oracle.com>2007-10-12 11:54:37 -0700
commit5eae5b96fc86e6c85f5f90e90fe9e6966f1fec63 (patch)
treef9ab0815a6b0ee9c181a17e304abb8386bd09843 /fs/ocfs2/dir.c
parent7e8536797d4508ddc790cc3af6a281db1582d485 (diff)
downloadop-kernel-dev-5eae5b96fc86e6c85f5f90e90fe9e6966f1fec63.zip
op-kernel-dev-5eae5b96fc86e6c85f5f90e90fe9e6966f1fec63.tar.gz
ocfs2: Remove open coded readdir()
ocfs2_queue_orphans() has an open coded readdir loop which can easily just use a directory accessor function. Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com> Reviewed-by: Joel Becker <joel.becker@oracle.com>
Diffstat (limited to 'fs/ocfs2/dir.c')
-rw-r--r--fs/ocfs2/dir.c28
1 files changed, 24 insertions, 4 deletions
diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c
index dbfa6f6..a75c340 100644
--- a/fs/ocfs2/dir.c
+++ b/fs/ocfs2/dir.c
@@ -81,10 +81,10 @@ static int ocfs2_do_extend_dir(struct super_block *sb,
struct ocfs2_alloc_context *meta_ac,
struct buffer_head **new_bh);
-int ocfs2_check_dir_entry(struct inode * dir,
- struct ocfs2_dir_entry * de,
- struct buffer_head * bh,
- unsigned long offset)
+static int ocfs2_check_dir_entry(struct inode * dir,
+ struct ocfs2_dir_entry * de,
+ struct buffer_head * bh,
+ unsigned long offset)
{
const char *error_msg = NULL;
const int rlen = le16_to_cpu(de->rec_len);
@@ -532,6 +532,26 @@ out:
}
/*
+ * This is intended to be called from inside other kernel functions,
+ * so we fake some arguments.
+ */
+int ocfs2_dir_foreach(struct inode *inode, loff_t *f_pos, void *priv,
+ filldir_t filldir)
+{
+ int ret = 0;
+ unsigned long version = inode->i_version;
+
+ while (*f_pos < i_size_read(inode)) {
+ ret = ocfs2_dir_foreach_blk(inode, &version, f_pos, priv,
+ filldir);
+ if (ret)
+ break;
+ }
+
+ return 0;
+}
+
+/*
* ocfs2_readdir()
*
*/
OpenPOWER on IntegriCloud