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

Commit 0f4da216 authored by Tristan Ye's avatar Tristan Ye Committed by Joel Becker
Browse files

Ocfs2: Re-access the journal after ocfs2_insert_extent() in dxdir codes. 



In ocfs2_dx_dir_rebalance(), we need to rejournal_acess the blocks after
calling ocfs2_insert_extent() since growing an extent tree may trigger
ocfs2_extend_trans(), which makes previous journal_access meaningless.

Signed-off-by: default avatarTristan Ye <tristan.ye@oracle.com>
Signed-off-by: default avatarJoel Becker <joel.becker@oracle.com>
parent 07eaac94

fs/ocfs2/dir.c

+16 −8
Original line number Diff line number Diff line
@@ -3931,6 +3931,15 @@ static int ocfs2_dx_dir_rebalance(struct ocfs2_super *osb, struct inode *dir, 
		goto out_commit;

	}



	cpos = split_hash;

	ret = ocfs2_dx_dir_new_cluster(dir, &et, cpos, handle,

				       data_ac, meta_ac, new_dx_leaves,

				       num_dx_leaves);

	if (ret) {

		mlog_errno(ret);

		goto out_commit;

	}



	for (i = 0; i < num_dx_leaves; i++) {

		ret = ocfs2_journal_access_dl(handle, INODE_CACHE(dir),

					      orig_dx_leaves[i],
@@ -3939,16 +3948,15 @@ static int ocfs2_dx_dir_rebalance(struct ocfs2_super *osb, struct inode *dir, 
			mlog_errno(ret);

			goto out_commit;

		}

	}



	cpos = split_hash;

	ret = ocfs2_dx_dir_new_cluster(dir, &et, cpos, handle,

				       data_ac, meta_ac, new_dx_leaves,

				       num_dx_leaves);

		ret = ocfs2_journal_access_dl(handle, INODE_CACHE(dir),

					      new_dx_leaves[i],

					      OCFS2_JOURNAL_ACCESS_WRITE);

		if (ret) {

			mlog_errno(ret);

			goto out_commit;

		}

	}



	ocfs2_dx_dir_transfer_leaf(dir, split_hash, handle, tmp_dx_leaf,

				   orig_dx_leaves, new_dx_leaves, num_dx_leaves);