aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/suballoc.h
diff options
context:
space:
mode:
authorJoel Becker <joel.becker@oracle.com>2008-11-13 17:49:19 -0500
committerMark Fasheh <mfasheh@suse.com>2009-01-05 11:36:53 -0500
commit970e4936d7d15f35d00fd15a14f5343ba78b2fc8 (patch)
tree92057c7deab6b9d8e5c3889d6a354b5989a3b68d /fs/ocfs2/suballoc.h
parent4ae1d69bedc8d174cb8a558694607e013157cde1 (diff)
ocfs2: Validate metadata only when it's read from disk.
Add an optional validation hook to ocfs2_read_blocks(). Now the validation function is only called when a block was actually read off of disk. It is not called when the buffer was in cache. We add a buffer state bit BH_NeedsValidate to flag these buffers. It must always be one higher than the last JBD2 buffer state bit. The dinode, dirblock, extent_block, and xattr_block validators are lifted to this scheme directly. The group_descriptor validator needs to be split into two pieces. The first part only needs the gd buffer and is passed to ocfs2_read_block(). The second part requires the dinode as well, and is called every time. It's only 3 compares, so it's tiny. This also allows us to clean up the non-fatal gd check used by resize.c. It now has no magic argument. Signed-off-by: Joel Becker <joel.becker@oracle.com> Signed-off-by: Mark Fasheh <mfasheh@suse.com>
Diffstat (limited to 'fs/ocfs2/suballoc.h')
-rw-r--r--fs/ocfs2/suballoc.h15
1 files changed, 7 insertions, 8 deletions
diff --git a/fs/ocfs2/suballoc.h b/fs/ocfs2/suballoc.h
index 43de4fd826d3..e3c13c77f9e8 100644
--- a/fs/ocfs2/suballoc.h
+++ b/fs/ocfs2/suballoc.h
@@ -165,16 +165,15 @@ void ocfs2_free_ac_resource(struct ocfs2_alloc_context *ac);
165u64 ocfs2_which_cluster_group(struct inode *inode, u32 cluster); 165u64 ocfs2_which_cluster_group(struct inode *inode, u32 cluster);
166 166
167/* 167/*
168 * By default, ocfs2_validate_group_descriptor() calls ocfs2_error() when it 168 * By default, ocfs2_read_group_descriptor() calls ocfs2_error() when it
169 * finds a problem. A caller that wants to check a group descriptor 169 * finds a problem. A caller that wants to check a group descriptor
170 * without going readonly passes a nonzero clean_error. This is only 170 * without going readonly should read the block with ocfs2_read_block[s]()
171 * resize, really. Everyone else should be using 171 * and then checking it with this function. This is only resize, really.
172 * ocfs2_read_group_descriptor(). 172 * Everyone else should be using ocfs2_read_group_descriptor().
173 */ 173 */
174int ocfs2_validate_group_descriptor(struct super_block *sb, 174int ocfs2_check_group_descriptor(struct super_block *sb,
175 struct ocfs2_dinode *di, 175 struct ocfs2_dinode *di,
176 struct buffer_head *bh, 176 struct buffer_head *bh);
177 int clean_error);
178/* 177/*
179 * Read a group descriptor block into *bh. If *bh is NULL, a bh will be 178 * Read a group descriptor block into *bh. If *bh is NULL, a bh will be
180 * allocated. This is a cached read. The descriptor will be validated with 179 * allocated. This is a cached read. The descriptor will be validated with