+++ /dev/null
-From: Joel Becker <joel.becker@oracle.com>
-Subject: ocfs2: Simplify ocfs2_read_block()
-Patch-mainline: 2.6.28
-
-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>
----
- fs/ocfs2/alloc.c | 25 ++++++++++---------------
- fs/ocfs2/aops.c | 6 ++----
- fs/ocfs2/buffer_head_io.h | 7 +++----
- fs/ocfs2/dir.c | 9 +++------
- fs/ocfs2/dlmglue.c | 8 ++------
- fs/ocfs2/extent_map.c | 8 +++-----
- fs/ocfs2/file.c | 7 +++----
- fs/ocfs2/inode.c | 4 ++--
- fs/ocfs2/journal.c | 2 +-
- fs/ocfs2/localalloc.c | 8 ++++----
- fs/ocfs2/namei.c | 2 +-
- fs/ocfs2/resize.c | 3 +--
- fs/ocfs2/slot_map.c | 2 +-
- fs/ocfs2/suballoc.c | 11 ++++-------
- fs/ocfs2/symlink.c | 5 +----
- fs/ocfs2/xattr.c | 42 ++++++++++++++----------------------------
- 16 files changed, 55 insertions(+), 94 deletions(-)
-
-Index: linux-2.6.27/fs/ocfs2/alloc.c
-===================================================================
---- linux-2.6.27.orig/fs/ocfs2/alloc.c
-+++ linux-2.6.27/fs/ocfs2/alloc.c
-@@ -706,7 +706,7 @@ int ocfs2_num_free_extents(struct ocfs2_
-
- if (last_eb_blk) {
- retval = ocfs2_read_block(inode, last_eb_blk,
-- &eb_bh, OCFS2_BH_CACHED);
-+ &eb_bh);
- if (retval < 0) {
- mlog_errno(retval);
- goto bail;
-@@ -1176,7 +1176,7 @@ static int ocfs2_find_branch_target(stru
- brelse(bh);
- bh = NULL;
-
-- status = ocfs2_read_block(inode, blkno, &bh, OCFS2_BH_CACHED);
-+ status = ocfs2_read_block(inode, blkno, &bh);
- if (status < 0) {
- mlog_errno(status);
- goto bail;
-@@ -1549,7 +1549,7 @@ static int __ocfs2_find_path(struct inod
-
- brelse(bh);
- bh = NULL;
-- ret = ocfs2_read_block(inode, blkno, &bh, OCFS2_BH_CACHED);
-+ ret = ocfs2_read_block(inode, blkno, &bh);
- if (ret) {
- mlog_errno(ret);
- goto out;
-@@ -4303,9 +4303,7 @@ static int ocfs2_figure_insert_type(stru
- * ocfs2_figure_insert_type() and ocfs2_add_branch()
- * may want it later.
- */
-- ret = ocfs2_read_block(inode,
-- ocfs2_et_get_last_eb_blk(et), &bh,
-- OCFS2_BH_CACHED);
-+ ret = ocfs2_read_block(inode, ocfs2_et_get_last_eb_blk(et), &bh);
- if (ret) {
- mlog_exit(ret);
- goto out;
-@@ -4771,9 +4769,8 @@ static int __ocfs2_mark_extent_written(s
- if (path->p_tree_depth) {
- struct ocfs2_extent_block *eb;
-
-- ret = ocfs2_read_block(inode,
-- ocfs2_et_get_last_eb_blk(et),
-- &last_eb_bh, OCFS2_BH_CACHED);
-+ ret = ocfs2_read_block(inode, ocfs2_et_get_last_eb_blk(et),
-+ &last_eb_bh);
- if (ret) {
- mlog_exit(ret);
- goto out;
-@@ -4930,9 +4927,8 @@ static int ocfs2_split_tree(struct inode
-
- depth = path->p_tree_depth;
- if (depth > 0) {
-- ret = ocfs2_read_block(inode,
-- ocfs2_et_get_last_eb_blk(et),
-- &last_eb_bh, OCFS2_BH_CACHED);
-+ ret = ocfs2_read_block(inode, ocfs2_et_get_last_eb_blk(et),
-+ &last_eb_bh);
- if (ret < 0) {
- mlog_errno(ret);
- goto out;
-@@ -5599,8 +5595,7 @@ static int ocfs2_get_truncate_log_info(s
- goto bail;
- }
-
-- status = ocfs2_read_block(inode, OCFS2_I(inode)->ip_blkno, &bh,
-- OCFS2_BH_CACHED);
-+ status = ocfs2_read_block(inode, OCFS2_I(inode)->ip_blkno, &bh);
- if (status < 0) {
- iput(inode);
- mlog_errno(status);
-@@ -6999,7 +6994,7 @@ int ocfs2_prepare_truncate(struct ocfs2_
-
- if (fe->id2.i_list.l_tree_depth) {
- status = ocfs2_read_block(inode, le64_to_cpu(fe->i_last_eb_blk),
-- &last_eb_bh, OCFS2_BH_CACHED);
-+ &last_eb_bh);
- if (status < 0) {
- mlog_errno(status);
- goto bail;
-Index: linux-2.6.27/fs/ocfs2/aops.c
-===================================================================
---- linux-2.6.27.orig/fs/ocfs2/aops.c
-+++ linux-2.6.27/fs/ocfs2/aops.c
-@@ -68,8 +68,7 @@ static int ocfs2_symlink_get_block(struc
- goto bail;
- }
-
-- status = ocfs2_read_block(inode, OCFS2_I(inode)->ip_blkno,
-- &bh, OCFS2_BH_CACHED);
-+ status = ocfs2_read_block(inode, OCFS2_I(inode)->ip_blkno, &bh);
- if (status < 0) {
- mlog_errno(status);
- goto bail;
-@@ -263,8 +262,7 @@ static int ocfs2_readpage_inline(struct
- BUG_ON(!PageLocked(page));
- BUG_ON(!(OCFS2_I(inode)->ip_dyn_features & OCFS2_INLINE_DATA_FL));
-
-- ret = ocfs2_read_block(inode, OCFS2_I(inode)->ip_blkno, &di_bh,
-- OCFS2_BH_CACHED);
-+ ret = ocfs2_read_block(inode, OCFS2_I(inode)->ip_blkno, &di_bh);
- if (ret) {
- mlog_errno(ret);
- goto out;
-Index: linux-2.6.27/fs/ocfs2/buffer_head_io.h
-===================================================================
---- linux-2.6.27.orig/fs/ocfs2/buffer_head_io.h
-+++ linux-2.6.27/fs/ocfs2/buffer_head_io.h
-@@ -33,8 +33,7 @@ void ocfs2_end_buffer_io_sync(struct buf
-
- 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 o
- #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(struc
- 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;
-Index: linux-2.6.27/fs/ocfs2/dir.c
-===================================================================
---- linux-2.6.27.orig/fs/ocfs2/dir.c
-+++ linux-2.6.27/fs/ocfs2/dir.c
-@@ -188,8 +188,7 @@ static struct buffer_head *ocfs2_find_en
- struct ocfs2_dinode *di;
- struct ocfs2_inline_data *data;
-
-- ret = ocfs2_read_block(dir, OCFS2_I(dir)->ip_blkno, &di_bh,
-- OCFS2_BH_CACHED);
-+ ret = ocfs2_read_block(dir, OCFS2_I(dir)->ip_blkno, &di_bh);
- if (ret) {
- mlog_errno(ret);
- goto out;
-@@ -417,8 +416,7 @@ static inline int ocfs2_delete_entry_id(
- struct ocfs2_dinode *di;
- struct ocfs2_inline_data *data;
-
-- ret = ocfs2_read_block(dir, OCFS2_I(dir)->ip_blkno,
-- &di_bh, OCFS2_BH_CACHED);
-+ ret = ocfs2_read_block(dir, OCFS2_I(dir)->ip_blkno, &di_bh);
- if (ret) {
- mlog_errno(ret);
- goto out;
-@@ -596,8 +594,7 @@ static int ocfs2_dir_foreach_blk_id(stru
- struct ocfs2_inline_data *data;
- struct ocfs2_dir_entry *de;
-
-- ret = ocfs2_read_block(inode, OCFS2_I(inode)->ip_blkno,
-- &di_bh, OCFS2_BH_CACHED);
-+ ret = ocfs2_read_block(inode, OCFS2_I(inode)->ip_blkno, &di_bh);
- if (ret) {
- mlog(ML_ERROR, "Unable to read inode block for dir %llu\n",
- (unsigned long long)OCFS2_I(inode)->ip_blkno);
-Index: linux-2.6.27/fs/ocfs2/dlmglue.c
-===================================================================
---- linux-2.6.27.orig/fs/ocfs2/dlmglue.c
-+++ linux-2.6.27/fs/ocfs2/dlmglue.c
-@@ -2024,8 +2024,7 @@ static int ocfs2_inode_lock_update(struc
- } else {
- /* Boo, we have to go to disk. */
- /* read bh, cast, ocfs2_refresh_inode */
-- status = ocfs2_read_block(inode, oi->ip_blkno,
-- bh, OCFS2_BH_CACHED);
-+ status = ocfs2_read_block(inode, oi->ip_blkno, bh);
- if (status < 0) {
- mlog_errno(status);
- goto bail_refresh;
-@@ -2086,10 +2085,7 @@ static int ocfs2_assign_bh(struct inode
- return 0;
- }
-
-- status = ocfs2_read_block(inode,
-- OCFS2_I(inode)->ip_blkno,
-- ret_bh,
-- OCFS2_BH_CACHED);
-+ status = ocfs2_read_block(inode, OCFS2_I(inode)->ip_blkno, ret_bh);
- if (status < 0)
- mlog_errno(status);
-
-Index: linux-2.6.27/fs/ocfs2/extent_map.c
-===================================================================
---- linux-2.6.27.orig/fs/ocfs2/extent_map.c
-+++ linux-2.6.27/fs/ocfs2/extent_map.c
-@@ -337,7 +337,7 @@ static int ocfs2_figure_hole_clusters(st
-
- ret = ocfs2_read_block(inode,
- le64_to_cpu(eb->h_next_leaf_blk),
-- &next_eb_bh, OCFS2_BH_CACHED);
-+ &next_eb_bh);
- if (ret) {
- mlog_errno(ret);
- goto out;
-@@ -458,8 +458,7 @@ int ocfs2_get_clusters(struct inode *ino
- if (ret == 0)
- goto out;
-
-- ret = ocfs2_read_block(inode, OCFS2_I(inode)->ip_blkno,
-- &di_bh, OCFS2_BH_CACHED);
-+ ret = ocfs2_read_block(inode, OCFS2_I(inode)->ip_blkno, &di_bh);
- if (ret) {
- mlog_errno(ret);
- goto out;
-Index: linux-2.6.27/fs/ocfs2/file.c
-===================================================================
---- linux-2.6.27.orig/fs/ocfs2/file.c
-+++ linux-2.6.27/fs/ocfs2/file.c
-@@ -545,8 +545,7 @@ static int __ocfs2_extend_allocation(str
- */
- BUG_ON(mark_unwritten && !ocfs2_sparse_alloc(osb));
-
-- status = ocfs2_read_block(inode, OCFS2_I(inode)->ip_blkno, &bh,
-- OCFS2_BH_CACHED);
-+ status = ocfs2_read_block(inode, OCFS2_I(inode)->ip_blkno, &bh);
- if (status < 0) {
- mlog_errno(status);
- goto leave;
-@@ -1132,7 +1131,7 @@ static int ocfs2_write_remove_suid(struc
- struct buffer_head *bh = NULL;
- struct ocfs2_inode_info *oi = OCFS2_I(inode);
-
-- ret = ocfs2_read_block(inode, oi->ip_blkno, &bh, OCFS2_BH_CACHED);
-+ ret = ocfs2_read_block(inode, oi->ip_blkno, &bh);
- if (ret < 0) {
- mlog_errno(ret);
- goto out;
-@@ -1159,7 +1158,7 @@ static int ocfs2_allocate_unwritten_exte
-
- if (OCFS2_I(inode)->ip_dyn_features & OCFS2_INLINE_DATA_FL) {
- ret = ocfs2_read_block(inode, OCFS2_I(inode)->ip_blkno,
-- &di_bh, OCFS2_BH_CACHED);
-+ &di_bh);
- if (ret) {
- mlog_errno(ret);
- goto out;
-Index: linux-2.6.27/fs/ocfs2/inode.c
-===================================================================
---- linux-2.6.27.orig/fs/ocfs2/inode.c
-+++ linux-2.6.27/fs/ocfs2/inode.c
-@@ -461,7 +461,7 @@ static int ocfs2_read_locked_inode(struc
- }
-
- 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 i
- 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;
-
-Index: linux-2.6.27/fs/ocfs2/journal.c
-===================================================================
---- linux-2.6.27.orig/fs/ocfs2/journal.c
-+++ linux-2.6.27/fs/ocfs2/journal.c
-@@ -1134,7 +1134,7 @@ static int ocfs2_read_journal_inode(stru
- }
- SET_INODE_JOURNAL(inode);
-
-- status = ocfs2_read_block(inode, OCFS2_I(inode)->ip_blkno, bh, 0);
-+ status = ocfs2_read_blocks(inode, OCFS2_I(inode)->ip_blkno, 1, bh, 0);
- if (status < 0) {
- mlog_errno(status);
- goto bail;
-Index: linux-2.6.27/fs/ocfs2/localalloc.c
-===================================================================
---- linux-2.6.27.orig/fs/ocfs2/localalloc.c
-+++ linux-2.6.27/fs/ocfs2/localalloc.c
-@@ -248,8 +248,8 @@ int ocfs2_load_local_alloc(struct ocfs2_
- goto bail;
- }
-
-- status = ocfs2_read_block(inode, OCFS2_I(inode)->ip_blkno,
-- &alloc_bh, 0);
-+ status = ocfs2_read_blocks(inode, OCFS2_I(inode)->ip_blkno, 1,
-+ &alloc_bh, 0);
- if (status < 0) {
- mlog_errno(status);
- goto bail;
-@@ -459,8 +459,8 @@ int ocfs2_begin_local_alloc_recovery(str
-
- mutex_lock(&inode->i_mutex);
-
-- status = ocfs2_read_block(inode, OCFS2_I(inode)->ip_blkno,
-- &alloc_bh, 0);
-+ status = ocfs2_read_blocks(inode, OCFS2_I(inode)->ip_blkno, 1,
-+ &alloc_bh, 0);
- if (status < 0) {
- mlog_errno(status);
- goto bail;
-Index: linux-2.6.27/fs/ocfs2/namei.c
-===================================================================
---- linux-2.6.27.orig/fs/ocfs2/namei.c
-+++ linux-2.6.27/fs/ocfs2/namei.c
-@@ -1754,7 +1754,7 @@ static int ocfs2_orphan_add(struct ocfs2
-
- status = ocfs2_read_block(orphan_dir_inode,
- OCFS2_I(orphan_dir_inode)->ip_blkno,
-- &orphan_dir_bh, OCFS2_BH_CACHED);
-+ &orphan_dir_bh);
- if (status < 0) {
- mlog_errno(status);
- goto leave;
-Index: linux-2.6.27/fs/ocfs2/resize.c
-===================================================================
---- linux-2.6.27.orig/fs/ocfs2/resize.c
-+++ linux-2.6.27/fs/ocfs2/resize.c
-@@ -332,8 +332,7 @@ int ocfs2_group_extend(struct inode * in
- lgd_blkno = ocfs2_which_cluster_group(main_bm_inode,
- first_new_cluster - 1);
-
-- ret = ocfs2_read_block(main_bm_inode, lgd_blkno, &group_bh,
-- OCFS2_BH_CACHED);
-+ ret = ocfs2_read_block(main_bm_inode, lgd_blkno, &group_bh);
- if (ret < 0) {
- mlog_errno(ret);
- goto out_unlock;
-Index: linux-2.6.27/fs/ocfs2/slot_map.c
-===================================================================
---- linux-2.6.27.orig/fs/ocfs2/slot_map.c
-+++ linux-2.6.27/fs/ocfs2/slot_map.c
-@@ -403,7 +403,7 @@ static int ocfs2_map_slot_buffers(struct
- (unsigned long long)blkno);
-
- bh = NULL; /* Acquire a fresh bh */
-- status = ocfs2_read_block(si->si_inode, blkno, &bh, 0);
-+ status = ocfs2_read_blocks(si->si_inode, blkno, 1, &bh, 0);
- if (status < 0) {
- mlog_errno(status);
- goto bail;
-Index: linux-2.6.27/fs/ocfs2/suballoc.c
-===================================================================
---- linux-2.6.27.orig/fs/ocfs2/suballoc.c
-+++ linux-2.6.27/fs/ocfs2/suballoc.c
-@@ -1172,8 +1172,7 @@ static int ocfs2_search_one_group(struct
- struct ocfs2_group_desc *gd;
- struct inode *alloc_inode = ac->ac_inode;
-
-- ret = ocfs2_read_block(alloc_inode, gd_blkno,
-- &group_bh, OCFS2_BH_CACHED);
-+ ret = ocfs2_read_block(alloc_inode, gd_blkno, &group_bh);
- if (ret < 0) {
- mlog_errno(ret);
- return ret;
-@@ -1244,7 +1243,7 @@ static int ocfs2_search_chain(struct ocf
-
- status = ocfs2_read_block(alloc_inode,
- le64_to_cpu(cl->cl_recs[chain].c_blkno),
-- &group_bh, OCFS2_BH_CACHED);
-+ &group_bh);
- if (status < 0) {
- mlog_errno(status);
- goto bail;
-@@ -1273,8 +1272,7 @@ static int ocfs2_search_chain(struct ocf
- prev_group_bh = group_bh;
- group_bh = NULL;
- status = ocfs2_read_block(alloc_inode,
-- next_group, &group_bh,
-- OCFS2_BH_CACHED);
-+ next_group, &group_bh);
- if (status < 0) {
- mlog_errno(status);
- goto bail;
-@@ -1795,8 +1793,7 @@ int ocfs2_free_suballoc_bits(handle_t *h
- (unsigned long long)OCFS2_I(alloc_inode)->ip_blkno, count,
- (unsigned long long)bg_blkno, start_bit);
-
-- status = ocfs2_read_block(alloc_inode, bg_blkno, &group_bh,
-- OCFS2_BH_CACHED);
-+ status = ocfs2_read_block(alloc_inode, bg_blkno, &group_bh);
- if (status < 0) {
- mlog_errno(status);
- goto bail;
-Index: linux-2.6.27/fs/ocfs2/symlink.c
-===================================================================
---- linux-2.6.27.orig/fs/ocfs2/symlink.c
-+++ linux-2.6.27/fs/ocfs2/symlink.c
-@@ -84,10 +84,7 @@ static char *ocfs2_fast_symlink_getlink(
-
- mlog_entry_void();
-
-- status = ocfs2_read_block(inode,
-- OCFS2_I(inode)->ip_blkno,
-- bh,
-- OCFS2_BH_CACHED);
-+ status = ocfs2_read_block(inode, OCFS2_I(inode)->ip_blkno, bh);
- if (status < 0) {
- mlog_errno(status);
- link = ERR_PTR(status);
-Index: linux-2.6.27/fs/ocfs2/xattr.c
-===================================================================
---- linux-2.6.27.orig/fs/ocfs2/xattr.c
-+++ linux-2.6.27/fs/ocfs2/xattr.c
-@@ -553,9 +553,7 @@ static int ocfs2_xattr_block_list(struct
- if (!di->i_xattr_loc)
- return ret;
-
-- ret = ocfs2_read_block(inode,
-- le64_to_cpu(di->i_xattr_loc),
-- &blk_bh, OCFS2_BH_CACHED);
-+ ret = ocfs2_read_block(inode, le64_to_cpu(di->i_xattr_loc), &blk_bh);
- if (ret < 0) {
- mlog_errno(ret);
- return ret;
-@@ -688,8 +686,7 @@ static int ocfs2_xattr_get_value_outside
- blkno = ocfs2_clusters_to_blocks(inode->i_sb, p_cluster);
- /* Copy ocfs2_xattr_value */
- for (i = 0; i < num_clusters * bpc; i++, blkno++) {
-- ret = ocfs2_read_block(inode, blkno,
-- &bh, OCFS2_BH_CACHED);
-+ ret = ocfs2_read_block(inode, blkno, &bh);
- if (ret) {
- mlog_errno(ret);
- goto out;
-@@ -780,9 +777,7 @@ static int ocfs2_xattr_block_get(struct
-
- memset(&xs->bucket, 0, sizeof(xs->bucket));
-
-- ret = ocfs2_read_block(inode,
-- le64_to_cpu(di->i_xattr_loc),
-- &blk_bh, OCFS2_BH_CACHED);
-+ ret = ocfs2_read_block(inode, le64_to_cpu(di->i_xattr_loc), &blk_bh);
- if (ret < 0) {
- mlog_errno(ret);
- return ret;
-@@ -938,8 +933,7 @@ static int __ocfs2_xattr_set_value_outsi
- blkno = ocfs2_clusters_to_blocks(inode->i_sb, p_cluster);
-
- for (i = 0; i < num_clusters * bpc; i++, blkno++) {
-- ret = ocfs2_read_block(inode, blkno,
-- &bh, OCFS2_BH_CACHED);
-+ ret = ocfs2_read_block(inode, blkno, &bh);
- if (ret) {
- mlog_errno(ret);
- goto out_commit;
-@@ -1530,8 +1524,7 @@ static int ocfs2_xattr_free_block(struct
- u64 blk, bg_blkno;
- u16 bit;
-
-- ret = ocfs2_read_block(inode, block, &blk_bh,
-- OCFS2_BH_CACHED);
-+ ret = ocfs2_read_block(inode, block, &blk_bh);
- if (ret < 0) {
- mlog_errno(ret);
- goto out;
-@@ -1789,9 +1782,7 @@ static int ocfs2_xattr_block_find(struct
- if (!di->i_xattr_loc)
- return ret;
-
-- ret = ocfs2_read_block(inode,
-- le64_to_cpu(di->i_xattr_loc),
-- &blk_bh, OCFS2_BH_CACHED);
-+ ret = ocfs2_read_block(inode, le64_to_cpu(di->i_xattr_loc), &blk_bh);
- if (ret < 0) {
- mlog_errno(ret);
- return ret;
-@@ -2232,9 +2223,8 @@ static int ocfs2_find_xe_in_bucket(struc
- break;
- }
-
-- ret = ocfs2_read_block(inode,
-- header_bh->b_blocknr + block_off,
-- &name_bh, OCFS2_BH_CACHED);
-+ ret = ocfs2_read_block(inode, header_bh->b_blocknr + block_off,
-+ &name_bh);
- if (ret) {
- mlog_errno(ret);
- break;
-@@ -2285,7 +2275,7 @@ static int ocfs2_xattr_bucket_find(struc
- u32 last_hash;
- u64 blkno;
-
-- ret = ocfs2_read_block(inode, p_blkno, &bh, OCFS2_BH_CACHED);
-+ ret = ocfs2_read_block(inode, p_blkno, &bh);
- if (ret) {
- mlog_errno(ret);
- goto out;
-@@ -2301,7 +2291,7 @@ static int ocfs2_xattr_bucket_find(struc
-
- blkno = p_blkno + bucket * blk_per_bucket;
-
-- ret = ocfs2_read_block(inode, blkno, &bh, OCFS2_BH_CACHED);
-+ ret = ocfs2_read_block(inode, blkno, &bh);
- if (ret) {
- mlog_errno(ret);
- goto out;
-@@ -2914,7 +2904,6 @@ static int ocfs2_defrag_xattr_bucket(str
- u64 blkno = bucket->bhs[0]->b_blocknr;
- u16 blk_per_bucket = ocfs2_blocks_per_xattr_bucket(inode->i_sb);
- u16 xh_free_start;
-- struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
- size_t blocksize = inode->i_sb->s_blocksize;
- handle_t *handle;
- struct buffer_head **bhs;
-@@ -3126,8 +3115,7 @@ static int ocfs2_mv_xattr_bucket_cross_c
- goto out;
- }
-
-- ret = ocfs2_read_block(inode, prev_blkno,
-- &old_bh, OCFS2_BH_CACHED);
-+ ret = ocfs2_read_block(inode, prev_blkno, &old_bh);
- if (ret < 0) {
- mlog_errno(ret);
- brelse(new_bh);
-@@ -3497,7 +3485,7 @@ static int ocfs2_cp_xattr_cluster(struct
- ocfs2_journal_dirty(handle, first_bh);
-
- /* update the new bucket header. */
-- ret = ocfs2_read_block(inode, to_blk_start, &bh, OCFS2_BH_CACHED);
-+ ret = ocfs2_read_block(inode, to_blk_start, &bh);
- if (ret < 0) {
- mlog_errno(ret);
- goto out;
-@@ -3884,8 +3872,7 @@ static int ocfs2_add_new_xattr_bucket(st
- goto out;
- }
-
-- ret = ocfs2_read_block(inode, p_blkno,
-- &first_bh, OCFS2_BH_CACHED);
-+ ret = ocfs2_read_block(inode, p_blkno, &first_bh);
- if (ret) {
- mlog_errno(ret);
- goto out;
-@@ -4236,8 +4223,7 @@ static int ocfs2_xattr_bucket_value_trun
- BUG_ON(value_blk != (offset + OCFS2_XATTR_ROOT_SIZE - 1) / blocksize);
- value_blk += header_bh->b_blocknr;
-
-- ret = ocfs2_read_block(inode, value_blk,
-- &value_bh, OCFS2_BH_CACHED);
-+ ret = ocfs2_read_block(inode, value_blk, &value_bh);
- if (ret) {
- mlog_errno(ret);
- goto out;
projects / people / teissler / ipfire-2.x.git / blobdiff