diff options
| author | Joel Becker <joel.becker@oracle.com> | 2008-10-10 02:20:31 +0200 |
|---|---|---|
| committer | Mark Fasheh <mfasheh@suse.com> | 2008-10-14 20:51:57 +0200 |
| commit | 0fcaa56a2a020dd6f90c202b7084e6f4cbedb6c2 (patch) | |
| tree | 057204016523ce0274d4a23ec02944075f084e8c /fs/ocfs2/buffer_head_io.h | |
| parent | ocfs2: Require an inode for ocfs2_read_block(s)(). (diff) | |
| download | linux-0fcaa56a2a020dd6f90c202b7084e6f4cbedb6c2.tar.xz linux-0fcaa56a2a020dd6f90c202b7084e6f4cbedb6c2.zip | |
ocfs2: Simplify ocfs2_read_block()
More than 30 callers of ocfs2_read_block() pass exactly OCFS2_BH_CACHED.
Only six pass a different flag set. Rather than have every caller care,
let's make ocfs2_read_block() take no flags and always do a cached read.
The remaining six places can call ocfs2_read_blocks() directly.
Signed-off-by: Joel Becker <joel.becker@oracle.com>
Signed-off-by: Mark Fasheh <mfasheh@suse.com>
Diffstat (limited to 'fs/ocfs2/buffer_head_io.h')
| -rw-r--r-- | fs/ocfs2/buffer_head_io.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/ocfs2/buffer_head_io.h b/fs/ocfs2/buffer_head_io.h index fd0d774ac356..a2ef9e5f8bfe 100644 --- a/fs/ocfs2/buffer_head_io.h +++ b/fs/ocfs2/buffer_head_io.h @@ -33,8 +33,7 @@ void ocfs2_end_buffer_io_sync(struct buffer_head *bh, static inline int ocfs2_read_block(struct inode *inode, u64 off, - struct buffer_head **bh, - int flags); + struct buffer_head **bh); int ocfs2_write_block(struct ocfs2_super *osb, struct buffer_head *bh, @@ -54,7 +53,7 @@ int ocfs2_write_super_or_backup(struct ocfs2_super *osb, #define OCFS2_BH_READAHEAD 8 static inline int ocfs2_read_block(struct inode *inode, u64 off, - struct buffer_head **bh, int flags) + struct buffer_head **bh) { int status = 0; @@ -64,7 +63,7 @@ static inline int ocfs2_read_block(struct inode *inode, u64 off, goto bail; } - status = ocfs2_read_blocks(inode, off, 1, bh, flags); + status = ocfs2_read_blocks(inode, off, 1, bh, OCFS2_BH_CACHED); bail: return status; |