Commit 9797a902 authored by Jan Kara's avatar Jan Kara Committed by Theodore Ts'o
Browse files

ocfs2: Use accessor function for h_buffer_credits 



Use the jbd2 accessor function for h_buffer_credits.

Reviewed-by: default avatarTheodore Ts'o <tytso@mit.edu>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20191105164437.32602-12-jack@suse.cz


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent a9a8344e

fs/ocfs2/alloc.c

+16 −16
Original line number Diff line number Diff line
@@ -2288,9 +2288,9 @@ static int ocfs2_extend_rotate_transaction(handle_t *handle, int subtree_depth, 
	int ret = 0;

	int credits = (path->p_tree_depth - subtree_depth) * 2 + 1 + op_credits;



	if (handle->h_buffer_credits < credits)

	if (jbd2_handle_buffer_credits(handle) < credits)

		ret = ocfs2_extend_trans(handle,

					 credits - handle->h_buffer_credits);

				credits - jbd2_handle_buffer_credits(handle));



	return ret;

}
@@ -2367,7 +2367,7 @@ static int ocfs2_rotate_tree_right(handle_t *handle, 
				   struct ocfs2_path *right_path,

				   struct ocfs2_path **ret_left_path)

{

	int ret, start, orig_credits = handle->h_buffer_credits;

	int ret, start, orig_credits = jbd2_handle_buffer_credits(handle);

	u32 cpos;

	struct ocfs2_path *left_path = NULL;

	struct super_block *sb = ocfs2_metadata_cache_get_super(et->et_ci);
@@ -3148,7 +3148,7 @@ static int ocfs2_rotate_tree_left(handle_t *handle, 
				  struct ocfs2_path *path,

				  struct ocfs2_cached_dealloc_ctxt *dealloc)

{

	int ret, orig_credits = handle->h_buffer_credits;

	int ret, orig_credits = jbd2_handle_buffer_credits(handle);

	struct ocfs2_path *tmp_path = NULL, *restart_path = NULL;

	struct ocfs2_extent_block *eb;

	struct ocfs2_extent_list *el;
@@ -3386,7 +3386,7 @@ static int ocfs2_merge_rec_right(struct ocfs2_path *left_path, 
							right_path);



		ret = ocfs2_extend_rotate_transaction(handle, subtree_index,

						      handle->h_buffer_credits,

					jbd2_handle_buffer_credits(handle),

					right_path);

		if (ret) {

			mlog_errno(ret);
@@ -3548,7 +3548,7 @@ static int ocfs2_merge_rec_left(struct ocfs2_path *right_path, 
							right_path);



		ret = ocfs2_extend_rotate_transaction(handle, subtree_index,

						      handle->h_buffer_credits,

					jbd2_handle_buffer_credits(handle),

					left_path);

		if (ret) {

			mlog_errno(ret);
@@ -3623,7 +3623,7 @@ static int ocfs2_merge_rec_left(struct ocfs2_path *right_path, 
		    le16_to_cpu(el->l_next_free_rec) == 1) {

			/* extend credit for ocfs2_remove_rightmost_path */

			ret = ocfs2_extend_rotate_transaction(handle, 0,

					handle->h_buffer_credits,

					jbd2_handle_buffer_credits(handle),

					right_path);

			if (ret) {

				mlog_errno(ret);
@@ -3669,7 +3669,7 @@ static int ocfs2_try_to_merge_extent(handle_t *handle, 
	if (ctxt->c_split_covers_rec && ctxt->c_has_empty_extent) {

		/* extend credit for ocfs2_remove_rightmost_path */

		ret = ocfs2_extend_rotate_transaction(handle, 0,

				handle->h_buffer_credits,

				jbd2_handle_buffer_credits(handle),

				path);

		if (ret) {

			mlog_errno(ret);
@@ -3725,7 +3725,7 @@ static int ocfs2_try_to_merge_extent(handle_t *handle, 


		/* extend credit for ocfs2_remove_rightmost_path */

		ret = ocfs2_extend_rotate_transaction(handle, 0,

					handle->h_buffer_credits,

					jbd2_handle_buffer_credits(handle),

					path);

		if (ret) {

			mlog_errno(ret);
@@ -3755,7 +3755,7 @@ static int ocfs2_try_to_merge_extent(handle_t *handle, 


		/* extend credit for ocfs2_remove_rightmost_path */

		ret = ocfs2_extend_rotate_transaction(handle, 0,

				handle->h_buffer_credits,

				jbd2_handle_buffer_credits(handle),

				path);

		if (ret) {

			mlog_errno(ret);
@@ -3799,7 +3799,7 @@ static int ocfs2_try_to_merge_extent(handle_t *handle, 
		if (ctxt->c_split_covers_rec) {

			/* extend credit for ocfs2_remove_rightmost_path */

			ret = ocfs2_extend_rotate_transaction(handle, 0,

					handle->h_buffer_credits,

					jbd2_handle_buffer_credits(handle),

					path);

			if (ret) {

				mlog_errno(ret);
@@ -5358,7 +5358,7 @@ static int ocfs2_truncate_rec(handle_t *handle, 
	if (ocfs2_is_empty_extent(&el->l_recs[0]) && index > 0) {

		/* extend credit for ocfs2_remove_rightmost_path */

		ret = ocfs2_extend_rotate_transaction(handle, 0,

				handle->h_buffer_credits,

				jbd2_handle_buffer_credits(handle),

				path);

		if (ret) {

			mlog_errno(ret);
@@ -5427,7 +5427,7 @@ static int ocfs2_truncate_rec(handle_t *handle, 
	}



	ret = ocfs2_extend_rotate_transaction(handle, 0,

					      handle->h_buffer_credits,

					jbd2_handle_buffer_credits(handle),

					path);

	if (ret) {

		mlog_errno(ret);

fs/ocfs2/journal.c

+2 −2
Original line number Diff line number Diff line
@@ -419,7 +419,7 @@ int ocfs2_extend_trans(handle_t *handle, int nblocks) 
	if (!nblocks)

		return 0;



	old_nblocks = handle->h_buffer_credits;

	old_nblocks = jbd2_handle_buffer_credits(handle);



	trace_ocfs2_extend_trans(old_nblocks, nblocks);
@@ -460,7 +460,7 @@ int ocfs2_allocate_extend_trans(handle_t *handle, int thresh) 


	BUG_ON(!handle);



	old_nblks = handle->h_buffer_credits;

	old_nblks = jbd2_handle_buffer_credits(handle);

	trace_ocfs2_allocate_extend_trans(old_nblks, thresh);



	if (old_nblks < thresh)

CRA Git | Maintained and supported by SUSTech CRA and CCSE