lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ocfs2: Simplify ocfs2_read_block()

Browse Source 
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>
This commit is contained in:
Joel Becker
2008-10-09 17:20:31 -07:00
committed by Mark Fasheh
parent 31d33073ca
commit 0fcaa56a2a
16 changed files with 55 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fs/ocfs2/inode.c
View File

@@ -461,7 +461,7 @@ static int ocfs2_read_locked_inode(struct inode *inode,
}
if (can_lock)
status = ocfs2_read_block(inode, args->fi_blkno, &bh, 0);
status = ocfs2_read_blocks(inode, args->fi_blkno, 1, &bh, 0);
else
status = ocfs2_read_blocks_sync(osb, args->fi_blkno, 1, &bh);
if (status < 0) {
@@ -1165,7 +1165,7 @@ struct buffer_head *ocfs2_bread(struct inode *inode,
goto fail;
}
tmperr = ocfs2_read_block(inode, p_blkno, &bh, readflags);
tmperr = ocfs2_read_blocks(inode, p_blkno, 1, &bh, readflags);
if (tmperr < 0)
goto fail;