|
@@ -914,9 +914,8 @@ bail:
|
|
|
* sets h_signature, h_blkno, h_suballoc_bit, h_suballoc_slot, and
|
|
|
* l_count for you
|
|
|
*/
|
|
|
-static int ocfs2_create_new_meta_bhs(struct ocfs2_super *osb,
|
|
|
- handle_t *handle,
|
|
|
- struct inode *inode,
|
|
|
+static int ocfs2_create_new_meta_bhs(handle_t *handle,
|
|
|
+ struct ocfs2_extent_tree *et,
|
|
|
int wanted,
|
|
|
struct ocfs2_alloc_context *meta_ac,
|
|
|
struct buffer_head *bhs[])
|
|
@@ -925,6 +924,8 @@ static int ocfs2_create_new_meta_bhs(struct ocfs2_super *osb,
|
|
|
u16 suballoc_bit_start;
|
|
|
u32 num_got;
|
|
|
u64 first_blkno;
|
|
|
+ struct ocfs2_super *osb =
|
|
|
+ OCFS2_SB(ocfs2_metadata_cache_get_super(et->et_ci));
|
|
|
struct ocfs2_extent_block *eb;
|
|
|
|
|
|
mlog_entry_void();
|
|
@@ -950,10 +951,10 @@ static int ocfs2_create_new_meta_bhs(struct ocfs2_super *osb,
|
|
|
mlog_errno(status);
|
|
|
goto bail;
|
|
|
}
|
|
|
- ocfs2_set_new_buffer_uptodate(INODE_CACHE(inode),
|
|
|
- bhs[i]);
|
|
|
+ ocfs2_set_new_buffer_uptodate(et->et_ci, bhs[i]);
|
|
|
|
|
|
- status = ocfs2_journal_access_eb(handle, INODE_CACHE(inode), bhs[i],
|
|
|
+ status = ocfs2_journal_access_eb(handle, et->et_ci,
|
|
|
+ bhs[i],
|
|
|
OCFS2_JOURNAL_ACCESS_CREATE);
|
|
|
if (status < 0) {
|
|
|
mlog_errno(status);
|
|
@@ -1141,7 +1142,7 @@ static int ocfs2_add_branch(struct ocfs2_super *osb,
|
|
|
goto bail;
|
|
|
}
|
|
|
|
|
|
- status = ocfs2_create_new_meta_bhs(osb, handle, inode, new_blocks,
|
|
|
+ status = ocfs2_create_new_meta_bhs(handle, et, new_blocks,
|
|
|
meta_ac, new_eb_bhs);
|
|
|
if (status < 0) {
|
|
|
mlog_errno(status);
|
|
@@ -1292,7 +1293,7 @@ static int ocfs2_shift_tree_depth(struct ocfs2_super *osb,
|
|
|
|
|
|
mlog_entry_void();
|
|
|
|
|
|
- status = ocfs2_create_new_meta_bhs(osb, handle, inode, 1, meta_ac,
|
|
|
+ status = ocfs2_create_new_meta_bhs(handle, et, 1, meta_ac,
|
|
|
&new_eb_bh);
|
|
|
if (status < 0) {
|
|
|
mlog_errno(status);
|