diff options
author | Joel Becker <joel.becker@oracle.com> | 2008-11-13 17:49:19 -0500 |
---|---|---|
committer | Mark Fasheh <mfasheh@suse.com> | 2009-01-05 11:36:53 -0500 |
commit | 970e4936d7d15f35d00fd15a14f5343ba78b2fc8 (patch) | |
tree | 92057c7deab6b9d8e5c3889d6a354b5989a3b68d /fs/ocfs2/dir.c | |
parent | 4ae1d69bedc8d174cb8a558694607e013157cde1 (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/dir.c')
-rw-r--r-- | fs/ocfs2/dir.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c index c2f3fd93be5..7e863d40380 100644 --- a/fs/ocfs2/dir.c +++ b/fs/ocfs2/dir.c | |||
@@ -214,6 +214,8 @@ static int ocfs2_validate_dir_block(struct super_block *sb, | |||
214 | * Nothing yet. We don't validate dirents here, that's handled | 214 | * Nothing yet. We don't validate dirents here, that's handled |
215 | * in-place when the code walks them. | 215 | * in-place when the code walks them. |
216 | */ | 216 | */ |
217 | mlog(0, "Validating dirblock %llu\n", | ||
218 | (unsigned long long)bh->b_blocknr); | ||
217 | 219 | ||
218 | return 0; | 220 | return 0; |
219 | } | 221 | } |
@@ -255,20 +257,13 @@ static int ocfs2_read_dir_block(struct inode *inode, u64 v_block, | |||
255 | goto out; | 257 | goto out; |
256 | } | 258 | } |
257 | 259 | ||
258 | rc = ocfs2_read_blocks(inode, p_blkno, 1, &tmp, flags); | 260 | rc = ocfs2_read_blocks(inode, p_blkno, 1, &tmp, flags, |
261 | ocfs2_validate_dir_block); | ||
259 | if (rc) { | 262 | if (rc) { |
260 | mlog_errno(rc); | 263 | mlog_errno(rc); |
261 | goto out; | 264 | goto out; |
262 | } | 265 | } |
263 | 266 | ||
264 | if (!(flags & OCFS2_BH_READAHEAD)) { | ||
265 | rc = ocfs2_validate_dir_block(inode->i_sb, tmp); | ||
266 | if (rc) { | ||
267 | brelse(tmp); | ||
268 | goto out; | ||
269 | } | ||
270 | } | ||
271 | |||
272 | /* If ocfs2_read_blocks() got us a new bh, pass it up. */ | 267 | /* If ocfs2_read_blocks() got us a new bh, pass it up. */ |
273 | if (!*bh) | 268 | if (!*bh) |
274 | *bh = tmp; | 269 | *bh = tmp; |