提交 42a5a7a9 编写于 作者: J Joel Becker

ocfs2: ocfs2_create_new_meta_bhs() doesn't need struct inode.

Pass struct ocfs2_extent_tree into ocfs2_create_new_meta_bhs().  It no
longer needs struct inode or ocfs2_super.
Signed-off-by: NJoel Becker <joel.becker@oracle.com>
上级 facdb77f
...@@ -914,9 +914,8 @@ int ocfs2_num_free_extents(struct ocfs2_super *osb, ...@@ -914,9 +914,8 @@ int ocfs2_num_free_extents(struct ocfs2_super *osb,
* sets h_signature, h_blkno, h_suballoc_bit, h_suballoc_slot, and * sets h_signature, h_blkno, h_suballoc_bit, h_suballoc_slot, and
* l_count for you * l_count for you
*/ */
static int ocfs2_create_new_meta_bhs(struct ocfs2_super *osb, static int ocfs2_create_new_meta_bhs(handle_t *handle,
handle_t *handle, struct ocfs2_extent_tree *et,
struct inode *inode,
int wanted, int wanted,
struct ocfs2_alloc_context *meta_ac, struct ocfs2_alloc_context *meta_ac,
struct buffer_head *bhs[]) struct buffer_head *bhs[])
...@@ -925,6 +924,8 @@ static int ocfs2_create_new_meta_bhs(struct ocfs2_super *osb, ...@@ -925,6 +924,8 @@ static int ocfs2_create_new_meta_bhs(struct ocfs2_super *osb,
u16 suballoc_bit_start; u16 suballoc_bit_start;
u32 num_got; u32 num_got;
u64 first_blkno; u64 first_blkno;
struct ocfs2_super *osb =
OCFS2_SB(ocfs2_metadata_cache_get_super(et->et_ci));
struct ocfs2_extent_block *eb; struct ocfs2_extent_block *eb;
mlog_entry_void(); mlog_entry_void();
...@@ -950,10 +951,10 @@ static int ocfs2_create_new_meta_bhs(struct ocfs2_super *osb, ...@@ -950,10 +951,10 @@ static int ocfs2_create_new_meta_bhs(struct ocfs2_super *osb,
mlog_errno(status); mlog_errno(status);
goto bail; goto bail;
} }
ocfs2_set_new_buffer_uptodate(INODE_CACHE(inode), ocfs2_set_new_buffer_uptodate(et->et_ci, bhs[i]);
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); OCFS2_JOURNAL_ACCESS_CREATE);
if (status < 0) { if (status < 0) {
mlog_errno(status); mlog_errno(status);
...@@ -1141,7 +1142,7 @@ static int ocfs2_add_branch(struct ocfs2_super *osb, ...@@ -1141,7 +1142,7 @@ static int ocfs2_add_branch(struct ocfs2_super *osb,
goto bail; 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); meta_ac, new_eb_bhs);
if (status < 0) { if (status < 0) {
mlog_errno(status); mlog_errno(status);
...@@ -1292,7 +1293,7 @@ static int ocfs2_shift_tree_depth(struct ocfs2_super *osb, ...@@ -1292,7 +1293,7 @@ static int ocfs2_shift_tree_depth(struct ocfs2_super *osb,
mlog_entry_void(); 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); &new_eb_bh);
if (status < 0) { if (status < 0) {
mlog_errno(status); mlog_errno(status);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册