Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ed9b777 authored by Joel Becker's avatar Joel Becker Committed by Tao Ma
Browse files

ocfs2: ocfs2_claim_*() don't need an ocfs2_super argument. 



They all take an ocfs2_alloc_context, which has the allocation inode.

Signed-off-by: default avatarJoel Becker <joel.becker@oracle.com>
Signed-off-by: default avatarTao Ma <tao.ma@oracle.com>
parent 13e434cf

fs/ocfs2/alloc.c

+3 −4
Original line number Diff line number Diff line
@@ -1015,8 +1015,7 @@ static int ocfs2_create_new_meta_bhs(handle_t *handle, 


	count = 0;

	while (count < wanted) {

		status = ocfs2_claim_metadata(osb,

					      handle,

		status = ocfs2_claim_metadata(handle,

					      meta_ac,

					      wanted - count,

					      &suballoc_bit_start,
@@ -4786,7 +4785,7 @@ int ocfs2_add_clusters_in_btree(handle_t *handle, 
		goto leave;

	}



	status = __ocfs2_claim_clusters(osb, handle, data_ac, 1,

	status = __ocfs2_claim_clusters(handle, data_ac, 1,

					clusters_to_add, &bit_off, &num_bits);

	if (status < 0) {

		if (status != -ENOSPC)
@@ -7201,7 +7200,7 @@ int ocfs2_convert_inline_data_to_extents(struct inode *inode, 


		data_ac->ac_resv = &OCFS2_I(inode)->ip_la_data_resv;



		ret = ocfs2_claim_clusters(osb, handle, data_ac, 1, &bit_off,

		ret = ocfs2_claim_clusters(handle, data_ac, 1, &bit_off,

					   &num);

		if (ret) {

			mlog_errno(ret);

fs/ocfs2/dir.c

+4 −4
Original line number Diff line number Diff line
@@ -2402,7 +2402,7 @@ static int ocfs2_dx_dir_attach_index(struct ocfs2_super *osb, 
	struct ocfs2_dir_block_trailer *trailer =

		ocfs2_trailer_from_bh(dirdata_bh, dir->i_sb);



	ret = ocfs2_claim_metadata(osb, handle, meta_ac, 1, &dr_suballoc_bit,

	ret = ocfs2_claim_metadata(handle, meta_ac, 1, &dr_suballoc_bit,

				   &num_bits, &dr_blkno);

	if (ret) {

		mlog_errno(ret);
@@ -2544,7 +2544,7 @@ static int __ocfs2_dx_dir_new_cluster(struct inode *dir, 
	 * chance of contiguousness as the directory grows in number

	 * of entries.

	 */

	ret = __ocfs2_claim_clusters(osb, handle, data_ac, 1, 1, &phys, &num);

	ret = __ocfs2_claim_clusters(handle, data_ac, 1, 1, &phys, &num);

	if (ret) {

		mlog_errno(ret);

		goto out;
@@ -2979,7 +2979,7 @@ static int ocfs2_expand_inline_dir(struct inode *dir, struct buffer_head *di_bh, 
	 */

	if (ocfs2_dir_resv_allowed(osb))

		data_ac->ac_resv = &oi->ip_la_data_resv;

	ret = ocfs2_claim_clusters(osb, handle, data_ac, 1, &bit_off, &len);

	ret = ocfs2_claim_clusters(handle, data_ac, 1, &bit_off, &len);

	if (ret) {

		mlog_errno(ret);

		goto out_commit;
@@ -3118,7 +3118,7 @@ static int ocfs2_expand_inline_dir(struct inode *dir, struct buffer_head *di_bh, 
	 * pass. Claim the 2nd cluster as a separate extent.

	 */

	if (alloc > len) {

		ret = ocfs2_claim_clusters(osb, handle, data_ac, 1, &bit_off,

		ret = ocfs2_claim_clusters(handle, data_ac, 1, &bit_off,

					   &len);

		if (ret) {

			mlog_errno(ret);

fs/ocfs2/localalloc.c

+2 −2
Original line number Diff line number Diff line
@@ -1161,7 +1161,7 @@ static int ocfs2_local_alloc_new_window(struct ocfs2_super *osb, 
	/* we used the generic suballoc reserve function, but we set

	 * everything up nicely, so there's no reason why we can't use

	 * the more specific cluster api to claim bits. */

	status = ocfs2_claim_clusters(osb, handle, ac, osb->local_alloc_bits,

	status = ocfs2_claim_clusters(handle, ac, osb->local_alloc_bits,

				      &cluster_off, &cluster_count);

	if (status == -ENOSPC) {

retry_enospc:
@@ -1175,7 +1175,7 @@ static int ocfs2_local_alloc_new_window(struct ocfs2_super *osb, 
			goto bail;



		ac->ac_bits_wanted = osb->local_alloc_default_bits;

		status = ocfs2_claim_clusters(osb, handle, ac,

		status = ocfs2_claim_clusters(handle, ac,

					      osb->local_alloc_bits,

					      &cluster_off,

					      &cluster_count);

fs/ocfs2/namei.c

+1 −1
Original line number Diff line number Diff line
@@ -478,7 +478,7 @@ static int ocfs2_mknod_locked(struct ocfs2_super *osb, 


	*new_fe_bh = NULL;



	status = ocfs2_claim_new_inode(osb, handle, dir, parent_fe_bh,

	status = ocfs2_claim_new_inode(handle, dir, parent_fe_bh,

				       inode_ac, &suballoc_bit, &fe_blkno);

	if (status < 0) {

		mlog_errno(status);

fs/ocfs2/refcounttree.c

+4 −4
Original line number Diff line number Diff line
@@ -597,7 +597,7 @@ static int ocfs2_create_refcount_tree(struct inode *inode, 
		goto out_commit;

	}



	ret = ocfs2_claim_metadata(osb, handle, meta_ac, 1,

	ret = ocfs2_claim_metadata(handle, meta_ac, 1,

				   &suballoc_bit_start, &num_got,

				   &first_blkno);

	if (ret) {
@@ -1297,7 +1297,7 @@ static int ocfs2_expand_inline_ref_root(handle_t *handle, 
		goto out;

	}



	ret = ocfs2_claim_metadata(OCFS2_SB(sb), handle, meta_ac, 1,

	ret = ocfs2_claim_metadata(handle, meta_ac, 1,

				   &suballoc_bit_start, &num_got,

				   &blkno);

	if (ret) {
@@ -1547,7 +1547,7 @@ static int ocfs2_new_leaf_refcount_block(handle_t *handle, 
		goto out;

	}



	ret = ocfs2_claim_metadata(OCFS2_SB(sb), handle, meta_ac, 1,

	ret = ocfs2_claim_metadata(handle, meta_ac, 1,

				   &suballoc_bit_start, &num_got,

				   &blkno);

	if (ret) {
@@ -3271,7 +3271,7 @@ static int ocfs2_make_clusters_writable(struct super_block *sb, 
		} else {

			delete = 1;



			ret = __ocfs2_claim_clusters(osb, handle,

			ret = __ocfs2_claim_clusters(handle,

						     context->data_ac,

						     1, set_len,

						     &new_bit, &new_len);