[Ocfs2-tools-devel] [PATCH 04/11] fsck.ocfs2: Extend struct _o2fsck_dirblocks

Sunil Mushran sunil.mushran at oracle.com
Fri Sep 30 12:22:14 PDT 2011


Extend struct _o2fsck_dirblocks to track the total number of directory blocks
that are referenced by the tree.

This will be used to provide progress in Pass 2 of fsck.

Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
---
 fsck.ocfs2/dirblocks.c         |    1 +
 fsck.ocfs2/include/dirblocks.h |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/fsck.ocfs2/dirblocks.c b/fsck.ocfs2/dirblocks.c
index 1e9fbb1..08726f2 100644
--- a/fsck.ocfs2/dirblocks.c
+++ b/fsck.ocfs2/dirblocks.c
@@ -65,6 +65,7 @@ errcode_t o2fsck_add_dir_block(o2fsck_dirblocks *db, uint64_t ino,
 
 	rb_link_node(&dbe->e_node, parent, p);
 	rb_insert_color(&dbe->e_node, &db->db_root);
+	db->db_numblocks++;
 
 out:
 	return ret;
diff --git a/fsck.ocfs2/include/dirblocks.h b/fsck.ocfs2/include/dirblocks.h
index f85974f..a5af303 100644
--- a/fsck.ocfs2/include/dirblocks.h
+++ b/fsck.ocfs2/include/dirblocks.h
@@ -29,6 +29,7 @@
 
 typedef struct _o2fsck_dirblocks {
 	struct rb_root	db_root;
+	uint64_t	db_numblocks;
 } o2fsck_dirblocks;
 
 typedef struct _o2fsck_dirblock_entry {
-- 
1.7.4.1




More information about the Ocfs2-tools-devel mailing list