diff options
author | Joel Becker <joel.becker@oracle.com> | 2008-10-09 20:20:34 -0400 |
---|---|---|
committer | Mark Fasheh <mfasheh@suse.com> | 2008-10-14 14:58:22 -0400 |
commit | d4a8c93c8248534bdedb07f83c9aebd6f7d1d579 (patch) | |
tree | f978a7b36d515c29657f271ca5b70281c911a82f /fs/ocfs2/inode.c | |
parent | 5e0b3dec0107540244ba343f983ef4f972db20de (diff) |
ocfs2: Make cached block reads the common case.
ocfs2_read_blocks() currently requires the CACHED flag for cached I/O.
However, that's the common case. Let's flip it around and provide an
IGNORE_CACHE flag for the special users. This has the added benefit of
cleaning up the code some (ignore_cache takes on its special meaning
earlier in the loop).
Signed-off-by: Joel Becker <joel.becker@oracle.com>
Signed-off-by: Mark Fasheh <mfasheh@suse.com>
Diffstat (limited to 'fs/ocfs2/inode.c')
-rw-r--r-- | fs/ocfs2/inode.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c index 8381c26b21a8..4903688f72a9 100644 --- a/fs/ocfs2/inode.c +++ b/fs/ocfs2/inode.c | |||
@@ -461,7 +461,8 @@ static int ocfs2_read_locked_inode(struct inode *inode, | |||
461 | } | 461 | } |
462 | 462 | ||
463 | if (can_lock) | 463 | if (can_lock) |
464 | status = ocfs2_read_blocks(inode, args->fi_blkno, 1, &bh, 0); | 464 | status = ocfs2_read_blocks(inode, args->fi_blkno, 1, &bh, |
465 | OCFS2_BH_IGNORE_CACHE); | ||
465 | else | 466 | else |
466 | status = ocfs2_read_blocks_sync(osb, args->fi_blkno, 1, &bh); | 467 | status = ocfs2_read_blocks_sync(osb, args->fi_blkno, 1, &bh); |
467 | if (status < 0) { | 468 | if (status < 0) { |