Commit cbee7e1a authored by Joel Becker's avatar Joel Becker
Browse files

ocfs2: ocfs2_add_clusters_in_btree() no longer needs struct inode. 



One more function that doesn't need a struct inode to pass to its
children.

Signed-off-by: default avatarJoel Becker <joel.becker@oracle.com>
parent cc79d8c1

fs/ocfs2/alloc.c

+7 −6
Original line number Diff line number Diff line
@@ -4758,13 +4758,11 @@ int ocfs2_insert_extent(handle_t *handle, 
 * it is not limited to the file storage. Any extent tree can use this

 * function if it implements the proper ocfs2_extent_tree.

 */

int ocfs2_add_clusters_in_btree(struct ocfs2_super *osb,

				struct inode *inode,

int ocfs2_add_clusters_in_btree(handle_t *handle,

				struct ocfs2_extent_tree *et,

				u32 *logical_offset,

				u32 clusters_to_add,

				int mark_unwritten,

				struct ocfs2_extent_tree *et,

				handle_t *handle,

				struct ocfs2_alloc_context *data_ac,

				struct ocfs2_alloc_context *meta_ac,

				enum ocfs2_alloc_restarted *reason_ret)
@@ -4775,6 +4773,8 @@ int ocfs2_add_clusters_in_btree(struct ocfs2_super *osb, 
	u32 bit_off, num_bits;

	u64 block;

	u8 flags = 0;

	struct ocfs2_super *osb =

		OCFS2_SB(ocfs2_metadata_cache_get_super(et->et_ci));



	BUG_ON(!clusters_to_add);
@@ -4826,8 +4826,9 @@ int ocfs2_add_clusters_in_btree(struct ocfs2_super *osb, 
	}



	block = ocfs2_clusters_to_blocks(osb->sb, bit_off);

	mlog(0, "Allocating %u clusters at block %u for inode %llu\n",

	     num_bits, bit_off, (unsigned long long)OCFS2_I(inode)->ip_blkno);

	mlog(0, "Allocating %u clusters at block %u for owner %llu\n",

	     num_bits, bit_off,

	     (unsigned long long)ocfs2_metadata_cache_owner(et->et_ci));

	status = ocfs2_insert_extent(handle, et, *logical_offset, block,

				     num_bits, flags, meta_ac);

	if (status < 0) {

fs/ocfs2/alloc.h

+2 −4
Original line number Diff line number Diff line
@@ -103,13 +103,11 @@ enum ocfs2_alloc_restarted { 
	RESTART_TRANS,

	RESTART_META

};

int ocfs2_add_clusters_in_btree(struct ocfs2_super *osb,

				struct inode *inode,

int ocfs2_add_clusters_in_btree(handle_t *handle,

				struct ocfs2_extent_tree *et,

				u32 *logical_offset,

				u32 clusters_to_add,

				int mark_unwritten,

				struct ocfs2_extent_tree *et,

				handle_t *handle,

				struct ocfs2_alloc_context *data_ac,

				struct ocfs2_alloc_context *meta_ac,

				enum ocfs2_alloc_restarted *reason_ret);

fs/ocfs2/file.c

+3 −4
Original line number Diff line number Diff line
@@ -516,9 +516,8 @@ int ocfs2_add_inode_data(struct ocfs2_super *osb, 
	struct ocfs2_extent_tree et;



	ocfs2_init_dinode_extent_tree(&et, inode, fe_bh);

	ret = ocfs2_add_clusters_in_btree(osb, inode, logical_offset,

	ret = ocfs2_add_clusters_in_btree(handle, &et, logical_offset,

					  clusters_to_add, mark_unwritten,

					   &et, handle,

					  data_ac, meta_ac, reason_ret);



	return ret;

fs/ocfs2/xattr.c

+2 −5
Original line number Diff line number Diff line
@@ -597,7 +597,6 @@ static int ocfs2_xattr_extend_allocation(struct inode *inode, 
	int status = 0;

	handle_t *handle = ctxt->handle;

	enum ocfs2_alloc_restarted why;

	struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);

	u32 prev_clusters, logical_start = le32_to_cpu(vb->vb_xv->xr_clusters);

	struct ocfs2_extent_tree et;
@@ -613,13 +612,11 @@ static int ocfs2_xattr_extend_allocation(struct inode *inode, 
	}



	prev_clusters = le32_to_cpu(vb->vb_xv->xr_clusters);

	status = ocfs2_add_clusters_in_btree(osb,

					     inode,

	status = ocfs2_add_clusters_in_btree(handle,

					     &et,

					     &logical_start,

					     clusters_to_add,

					     0,

					     &et,

					     handle,

					     ctxt->data_ac,

					     ctxt->meta_ac,

					     &why);