aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/ocfs2/alloc.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c
index ecd97309493f..ad41eabd8b74 100644
--- a/fs/ocfs2/alloc.c
+++ b/fs/ocfs2/alloc.c
@@ -914,9 +914,8 @@ bail:
914 * sets h_signature, h_blkno, h_suballoc_bit, h_suballoc_slot, and 914 * sets h_signature, h_blkno, h_suballoc_bit, h_suballoc_slot, and
915 * l_count for you 915 * l_count for you
916 */ 916 */
917static int ocfs2_create_new_meta_bhs(struct ocfs2_super *osb, 917static int ocfs2_create_new_meta_bhs(handle_t *handle,
918 handle_t *handle, 918 struct ocfs2_extent_tree *et,
919 struct inode *inode,
920 int wanted, 919 int wanted,
921 struct ocfs2_alloc_context *meta_ac, 920 struct ocfs2_alloc_context *meta_ac,
922 struct buffer_head *bhs[]) 921 struct buffer_head *bhs[])
@@ -925,6 +924,8 @@ static int ocfs2_create_new_meta_bhs(struct ocfs2_super *osb,
925 u16 suballoc_bit_start; 924 u16 suballoc_bit_start;
926 u32 num_got; 925 u32 num_got;
927 u64 first_blkno; 926 u64 first_blkno;
927 struct ocfs2_super *osb =
928 OCFS2_SB(ocfs2_metadata_cache_get_super(et->et_ci));
928 struct ocfs2_extent_block *eb; 929 struct ocfs2_extent_block *eb;
929 930
930 mlog_entry_void(); 931 mlog_entry_void();
@@ -950,10 +951,10 @@ static int ocfs2_create_new_meta_bhs(struct ocfs2_super *osb,
950 mlog_errno(status); 951 mlog_errno(status);
951 goto bail; 952 goto bail;
952 } 953 }
953 ocfs2_set_new_buffer_uptodate(INODE_CACHE(inode), 954 ocfs2_set_new_buffer_uptodate(et->et_ci, bhs[i]);
954 bhs[i]);
955 955
956 status = ocfs2_journal_access_eb(handle, INODE_CACHE(inode), bhs[i], 956 status = ocfs2_journal_access_eb(handle, et->et_ci,
957 bhs[i],
957 OCFS2_JOURNAL_ACCESS_CREATE); 958 OCFS2_JOURNAL_ACCESS_CREATE);
958 if (status < 0) { 959 if (status < 0) {
959 mlog_errno(status); 960 mlog_errno(status);
@@ -1141,7 +1142,7 @@ static int ocfs2_add_branch(struct ocfs2_super *osb,
1141 goto bail; 1142 goto bail;
1142 } 1143 }
1143 1144
1144 status = ocfs2_create_new_meta_bhs(osb, handle, inode, new_blocks, 1145 status = ocfs2_create_new_meta_bhs(handle, et, new_blocks,
1145 meta_ac, new_eb_bhs); 1146 meta_ac, new_eb_bhs);
1146 if (status < 0) { 1147 if (status < 0) {
1147 mlog_errno(status); 1148 mlog_errno(status);
@@ -1292,7 +1293,7 @@ static int ocfs2_shift_tree_depth(struct ocfs2_super *osb,
1292 1293
1293 mlog_entry_void(); 1294 mlog_entry_void();
1294 1295
1295 status = ocfs2_create_new_meta_bhs(osb, handle, inode, 1, meta_ac, 1296 status = ocfs2_create_new_meta_bhs(handle, et, 1, meta_ac,
1296 &new_eb_bh); 1297 &new_eb_bh);
1297 if (status < 0) { 1298 if (status < 0) {
1298 mlog_errno(status); 1299 mlog_errno(status);