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

Commit 0cf2f763 authored by Joel Becker's avatar Joel Becker
Browse files

ocfs2: Pass struct ocfs2_caching_info to the journal functions. 



The next step in divorcing metadata I/O management from struct inode is
to pass struct ocfs2_caching_info to the journal functions.  Thus the
journal locks a metadata cache with the cache io_lock function.  It also
can compare ci_last_trans and ci_created_trans directly.

This is a large patch because of all the places we change
ocfs2_journal_access..(handle, inode, ...) to
ocfs2_journal_access..(handle, INODE_CACHE(inode), ...).

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

fs/ocfs2/alloc.c

+52 −51
Original line number Diff line number Diff line
@@ -415,11 +415,11 @@ static inline void ocfs2_et_update_clusters(struct inode *inode, 
}



static inline int ocfs2_et_root_journal_access(handle_t *handle,

					       struct inode *inode,

					       struct ocfs2_caching_info *ci,

					       struct ocfs2_extent_tree *et,

					       int type)

{

	return et->et_root_journal_access(handle, inode, et->et_root_bh,

	return et->et_root_journal_access(handle, ci, et->et_root_bh,

					  type);

}
@@ -633,7 +633,7 @@ static struct ocfs2_path *ocfs2_new_path_from_et(struct ocfs2_extent_tree *et) 
 * ocfs2_journal_access_path(), but I don't have a better one.

 */

static int ocfs2_path_bh_journal_access(handle_t *handle,

					struct inode *inode,

					struct ocfs2_caching_info *ci,

					struct ocfs2_path *path,

					int idx)

{
@@ -645,14 +645,15 @@ static int ocfs2_path_bh_journal_access(handle_t *handle, 
	if (idx)

		access = ocfs2_journal_access_eb;



	return access(handle, inode, path->p_node[idx].bh,

	return access(handle, ci, path->p_node[idx].bh,

		      OCFS2_JOURNAL_ACCESS_WRITE);

}



/*

 * Convenience function to journal all components in a path.

 */

static int ocfs2_journal_access_path(struct inode *inode, handle_t *handle,

static int ocfs2_journal_access_path(struct ocfs2_caching_info *ci,

				     handle_t *handle,

				     struct ocfs2_path *path)

{

	int i, ret = 0;
@@ -661,7 +662,7 @@ static int ocfs2_journal_access_path(struct inode *inode, handle_t *handle, 
		goto out;



	for(i = 0; i < path_num_items(path); i++) {

		ret = ocfs2_path_bh_journal_access(handle, inode, path, i);

		ret = ocfs2_path_bh_journal_access(handle, ci, path, i);

		if (ret < 0) {

			mlog_errno(ret);

			goto out;
@@ -952,7 +953,7 @@ static int ocfs2_create_new_meta_bhs(struct ocfs2_super *osb, 
			ocfs2_set_new_buffer_uptodate(INODE_CACHE(inode),

						      bhs[i]);



			status = ocfs2_journal_access_eb(handle, inode, bhs[i],

			status = ocfs2_journal_access_eb(handle, INODE_CACHE(inode), bhs[i],

							 OCFS2_JOURNAL_ACCESS_CREATE);

			if (status < 0) {

				mlog_errno(status);
@@ -1051,7 +1052,7 @@ static int ocfs2_adjust_rightmost_branch(handle_t *handle, 
		goto out;

	}



	status = ocfs2_journal_access_path(inode, handle, path);

	status = ocfs2_journal_access_path(INODE_CACHE(inode), handle, path);

	if (status < 0) {

		mlog_errno(status);

		goto out;
@@ -1162,7 +1163,7 @@ static int ocfs2_add_branch(struct ocfs2_super *osb, 
		BUG_ON(!OCFS2_IS_VALID_EXTENT_BLOCK(eb));

		eb_el = &eb->h_list;



		status = ocfs2_journal_access_eb(handle, inode, bh,

		status = ocfs2_journal_access_eb(handle, INODE_CACHE(inode), bh,

						 OCFS2_JOURNAL_ACCESS_CREATE);

		if (status < 0) {

			mlog_errno(status);
@@ -1202,20 +1203,20 @@ static int ocfs2_add_branch(struct ocfs2_super *osb, 
	 * journal_dirty erroring as it won't unless we've aborted the

	 * handle (in which case we would never be here) so reserving

	 * the write with journal_access is all we need to do. */

	status = ocfs2_journal_access_eb(handle, inode, *last_eb_bh,

	status = ocfs2_journal_access_eb(handle, INODE_CACHE(inode), *last_eb_bh,

					 OCFS2_JOURNAL_ACCESS_WRITE);

	if (status < 0) {

		mlog_errno(status);

		goto bail;

	}

	status = ocfs2_et_root_journal_access(handle, inode, et,

	status = ocfs2_et_root_journal_access(handle, INODE_CACHE(inode), et,

					      OCFS2_JOURNAL_ACCESS_WRITE);

	if (status < 0) {

		mlog_errno(status);

		goto bail;

	}

	if (eb_bh) {

		status = ocfs2_journal_access_eb(handle, inode, eb_bh,

		status = ocfs2_journal_access_eb(handle, INODE_CACHE(inode), eb_bh,

						 OCFS2_JOURNAL_ACCESS_WRITE);

		if (status < 0) {

			mlog_errno(status);
@@ -1305,7 +1306,7 @@ static int ocfs2_shift_tree_depth(struct ocfs2_super *osb, 
	eb_el = &eb->h_list;

	root_el = et->et_root_el;



	status = ocfs2_journal_access_eb(handle, inode, new_eb_bh,

	status = ocfs2_journal_access_eb(handle, INODE_CACHE(inode), new_eb_bh,

					 OCFS2_JOURNAL_ACCESS_CREATE);

	if (status < 0) {

		mlog_errno(status);
@@ -1324,7 +1325,7 @@ static int ocfs2_shift_tree_depth(struct ocfs2_super *osb, 
		goto bail;

	}



	status = ocfs2_et_root_journal_access(handle, inode, et,

	status = ocfs2_et_root_journal_access(handle, INODE_CACHE(inode), et,

					      OCFS2_JOURNAL_ACCESS_WRITE);

	if (status < 0) {

		mlog_errno(status);
@@ -2095,7 +2096,7 @@ static int ocfs2_rotate_subtree_right(struct inode *inode, 
	root_bh = left_path->p_node[subtree_index].bh;

	BUG_ON(root_bh != right_path->p_node[subtree_index].bh);



	ret = ocfs2_path_bh_journal_access(handle, inode, right_path,

	ret = ocfs2_path_bh_journal_access(handle, INODE_CACHE(inode), right_path,

					   subtree_index);

	if (ret) {

		mlog_errno(ret);
@@ -2103,14 +2104,14 @@ static int ocfs2_rotate_subtree_right(struct inode *inode, 
	}



	for(i = subtree_index + 1; i < path_num_items(right_path); i++) {

		ret = ocfs2_path_bh_journal_access(handle, inode,

		ret = ocfs2_path_bh_journal_access(handle, INODE_CACHE(inode),

						   right_path, i);

		if (ret) {

			mlog_errno(ret);

			goto out;

		}



		ret = ocfs2_path_bh_journal_access(handle, inode,

		ret = ocfs2_path_bh_journal_access(handle, INODE_CACHE(inode),

						   left_path, i);

		if (ret) {

			mlog_errno(ret);
@@ -2503,7 +2504,7 @@ static int ocfs2_update_edge_lengths(struct inode *inode, handle_t *handle, 
		goto out;

	}



	ret = ocfs2_journal_access_path(inode, handle, path);

	ret = ocfs2_journal_access_path(INODE_CACHE(inode), handle, path);

	if (ret) {

		mlog_errno(ret);

		goto out;
@@ -2654,7 +2655,7 @@ static int ocfs2_rotate_subtree_left(struct inode *inode, handle_t *handle, 
			return -EAGAIN;



		if (le16_to_cpu(right_leaf_el->l_next_free_rec) > 1) {

			ret = ocfs2_journal_access_eb(handle, inode,

			ret = ocfs2_journal_access_eb(handle, INODE_CACHE(inode),

						      path_leaf_bh(right_path),

						      OCFS2_JOURNAL_ACCESS_WRITE);

			if (ret) {
@@ -2673,7 +2674,7 @@ static int ocfs2_rotate_subtree_left(struct inode *inode, handle_t *handle, 
		 * We have to update i_last_eb_blk during the meta

		 * data delete.

		 */

		ret = ocfs2_et_root_journal_access(handle, inode, et,

		ret = ocfs2_et_root_journal_access(handle, INODE_CACHE(inode), et,

						   OCFS2_JOURNAL_ACCESS_WRITE);

		if (ret) {

			mlog_errno(ret);
@@ -2689,7 +2690,7 @@ static int ocfs2_rotate_subtree_left(struct inode *inode, handle_t *handle, 
	 */

	BUG_ON(right_has_empty && !del_right_subtree);



	ret = ocfs2_path_bh_journal_access(handle, inode, right_path,

	ret = ocfs2_path_bh_journal_access(handle, INODE_CACHE(inode), right_path,

					   subtree_index);

	if (ret) {

		mlog_errno(ret);
@@ -2697,14 +2698,14 @@ static int ocfs2_rotate_subtree_left(struct inode *inode, handle_t *handle, 
	}



	for(i = subtree_index + 1; i < path_num_items(right_path); i++) {

		ret = ocfs2_path_bh_journal_access(handle, inode,

		ret = ocfs2_path_bh_journal_access(handle, INODE_CACHE(inode),

						   right_path, i);

		if (ret) {

			mlog_errno(ret);

			goto out;

		}



		ret = ocfs2_path_bh_journal_access(handle, inode,

		ret = ocfs2_path_bh_journal_access(handle, INODE_CACHE(inode),

						   left_path, i);

		if (ret) {

			mlog_errno(ret);
@@ -2864,7 +2865,7 @@ static int ocfs2_rotate_rightmost_leaf_left(struct inode *inode, 
	if (!ocfs2_is_empty_extent(&el->l_recs[0]))

		return 0;



	ret = ocfs2_path_bh_journal_access(handle, inode, path,

	ret = ocfs2_path_bh_journal_access(handle, INODE_CACHE(inode), path,

					   path_num_items(path) - 1);

	if (ret) {

		mlog_errno(ret);
@@ -2947,7 +2948,7 @@ static int __ocfs2_rotate_tree_left(struct inode *inode, 
		 * Caller might still want to make changes to the

		 * tree root, so re-add it to the journal here.

		 */

		ret = ocfs2_path_bh_journal_access(handle, inode,

		ret = ocfs2_path_bh_journal_access(handle, INODE_CACHE(inode),

						   left_path, 0);

		if (ret) {

			mlog_errno(ret);
@@ -3025,7 +3026,7 @@ static int ocfs2_remove_rightmost_path(struct inode *inode, handle_t *handle, 
		goto out;

	}



	ret = ocfs2_journal_access_path(inode, handle, path);

	ret = ocfs2_journal_access_path(INODE_CACHE(inode), handle, path);

	if (ret) {

		mlog_errno(ret);

		goto out;
@@ -3055,7 +3056,7 @@ static int ocfs2_remove_rightmost_path(struct inode *inode, handle_t *handle, 
			goto out;

		}



		ret = ocfs2_journal_access_path(inode, handle, left_path);

		ret = ocfs2_journal_access_path(INODE_CACHE(inode), handle, left_path);

		if (ret) {

			mlog_errno(ret);

			goto out;
@@ -3370,7 +3371,7 @@ static int ocfs2_merge_rec_right(struct inode *inode, 
		root_bh = left_path->p_node[subtree_index].bh;

		BUG_ON(root_bh != right_path->p_node[subtree_index].bh);



		ret = ocfs2_path_bh_journal_access(handle, inode, right_path,

		ret = ocfs2_path_bh_journal_access(handle, INODE_CACHE(inode), right_path,

						   subtree_index);

		if (ret) {

			mlog_errno(ret);
@@ -3379,14 +3380,14 @@ static int ocfs2_merge_rec_right(struct inode *inode, 


		for (i = subtree_index + 1;

		     i < path_num_items(right_path); i++) {

			ret = ocfs2_path_bh_journal_access(handle, inode,

			ret = ocfs2_path_bh_journal_access(handle, INODE_CACHE(inode),

							   right_path, i);

			if (ret) {

				mlog_errno(ret);

				goto out;

			}



			ret = ocfs2_path_bh_journal_access(handle, inode,

			ret = ocfs2_path_bh_journal_access(handle, INODE_CACHE(inode),

							   left_path, i);

			if (ret) {

				mlog_errno(ret);
@@ -3399,7 +3400,7 @@ static int ocfs2_merge_rec_right(struct inode *inode, 
		right_rec = &el->l_recs[index + 1];

	}



	ret = ocfs2_path_bh_journal_access(handle, inode, left_path,

	ret = ocfs2_path_bh_journal_access(handle, INODE_CACHE(inode), left_path,

					   path_num_items(left_path) - 1);

	if (ret) {

		mlog_errno(ret);
@@ -3539,7 +3540,7 @@ static int ocfs2_merge_rec_left(struct inode *inode, 
		root_bh = left_path->p_node[subtree_index].bh;

		BUG_ON(root_bh != right_path->p_node[subtree_index].bh);



		ret = ocfs2_path_bh_journal_access(handle, inode, right_path,

		ret = ocfs2_path_bh_journal_access(handle, INODE_CACHE(inode), right_path,

						   subtree_index);

		if (ret) {

			mlog_errno(ret);
@@ -3548,14 +3549,14 @@ static int ocfs2_merge_rec_left(struct inode *inode, 


		for (i = subtree_index + 1;

		     i < path_num_items(right_path); i++) {

			ret = ocfs2_path_bh_journal_access(handle, inode,

			ret = ocfs2_path_bh_journal_access(handle, INODE_CACHE(inode),

							   right_path, i);

			if (ret) {

				mlog_errno(ret);

				goto out;

			}



			ret = ocfs2_path_bh_journal_access(handle, inode,

			ret = ocfs2_path_bh_journal_access(handle, INODE_CACHE(inode),

							   left_path, i);

			if (ret) {

				mlog_errno(ret);
@@ -3568,7 +3569,7 @@ static int ocfs2_merge_rec_left(struct inode *inode, 
			has_empty_extent = 1;

	}



	ret = ocfs2_path_bh_journal_access(handle, inode, right_path,

	ret = ocfs2_path_bh_journal_access(handle, INODE_CACHE(inode), right_path,

					   path_num_items(right_path) - 1);

	if (ret) {

		mlog_errno(ret);
@@ -4006,7 +4007,7 @@ static int ocfs2_append_rec_to_path(struct inode *inode, handle_t *handle, 
		}

	}



	ret = ocfs2_journal_access_path(inode, handle, right_path);

	ret = ocfs2_journal_access_path(INODE_CACHE(inode), handle, right_path);

	if (ret) {

		mlog_errno(ret);

		goto out;
@@ -4135,7 +4136,7 @@ static int ocfs2_insert_path(struct inode *inode, 
			goto out;

		}



		ret = ocfs2_journal_access_path(inode, handle, left_path);

		ret = ocfs2_journal_access_path(INODE_CACHE(inode), handle, left_path);

		if (ret < 0) {

			mlog_errno(ret);

			goto out;
@@ -4146,7 +4147,7 @@ static int ocfs2_insert_path(struct inode *inode, 
	 * Pass both paths to the journal. The majority of inserts

	 * will be touching all components anyway.

	 */

	ret = ocfs2_journal_access_path(inode, handle, right_path);

	ret = ocfs2_journal_access_path(INODE_CACHE(inode), handle, right_path);

	if (ret < 0) {

		mlog_errno(ret);

		goto out;
@@ -4211,7 +4212,7 @@ static int ocfs2_do_insert_extent(struct inode *inode, 


	el = et->et_root_el;



	ret = ocfs2_et_root_journal_access(handle, inode, et,

	ret = ocfs2_et_root_journal_access(handle, INODE_CACHE(inode), et,

					   OCFS2_JOURNAL_ACCESS_WRITE);

	if (ret) {

		mlog_errno(ret);
@@ -4273,7 +4274,7 @@ static int ocfs2_do_insert_extent(struct inode *inode, 
		 * ocfs2_rotate_tree_right() might have extended the

		 * transaction without re-journaling our tree root.

		 */

		ret = ocfs2_et_root_journal_access(handle, inode, et,

		ret = ocfs2_et_root_journal_access(handle, INODE_CACHE(inode), et,

						   OCFS2_JOURNAL_ACCESS_WRITE);

		if (ret) {

			mlog_errno(ret);
@@ -4796,7 +4797,7 @@ int ocfs2_add_clusters_in_btree(struct ocfs2_super *osb, 
	BUG_ON(num_bits > clusters_to_add);



	/* reserve our write early -- insert_extent may update the tree root */

	status = ocfs2_et_root_journal_access(handle, inode, et,

	status = ocfs2_et_root_journal_access(handle, INODE_CACHE(inode), et,

					      OCFS2_JOURNAL_ACCESS_WRITE);

	if (status < 0) {

		mlog_errno(status);
@@ -4971,7 +4972,7 @@ static int ocfs2_replace_extent_rec(struct inode *inode, 
{

	int ret;



	ret = ocfs2_path_bh_journal_access(handle, inode, path,

	ret = ocfs2_path_bh_journal_access(handle, INODE_CACHE(inode), path,

					   path_num_items(path) - 1);

	if (ret) {

		mlog_errno(ret);
@@ -5333,13 +5334,13 @@ static int ocfs2_truncate_rec(struct inode *inode, handle_t *handle, 
		goto out;

	}



	ret = ocfs2_journal_access_path(inode, handle, path);

	ret = ocfs2_journal_access_path(INODE_CACHE(inode), handle, path);

	if (ret) {

		mlog_errno(ret);

		goto out;

	}



	ret = ocfs2_journal_access_path(inode, handle, left_path);

	ret = ocfs2_journal_access_path(INODE_CACHE(inode), handle, left_path);

	if (ret) {

		mlog_errno(ret);

		goto out;
@@ -5574,7 +5575,7 @@ int ocfs2_remove_btree_range(struct inode *inode, 
		goto out;

	}



	ret = ocfs2_et_root_journal_access(handle, inode, et,

	ret = ocfs2_et_root_journal_access(handle, INODE_CACHE(inode), et,

					   OCFS2_JOURNAL_ACCESS_WRITE);

	if (ret) {

		mlog_errno(ret);
@@ -5691,7 +5692,7 @@ int ocfs2_truncate_log_append(struct ocfs2_super *osb, 
		goto bail;

	}



	status = ocfs2_journal_access_di(handle, tl_inode, tl_bh,

	status = ocfs2_journal_access_di(handle, INODE_CACHE(tl_inode), tl_bh,

					 OCFS2_JOURNAL_ACCESS_WRITE);

	if (status < 0) {

		mlog_errno(status);
@@ -5753,7 +5754,7 @@ static int ocfs2_replay_truncate_records(struct ocfs2_super *osb, 
	while (i >= 0) {

		/* Caller has given us at least enough credits to

		 * update the truncate log dinode */

		status = ocfs2_journal_access_di(handle, tl_inode, tl_bh,

		status = ocfs2_journal_access_di(handle, INODE_CACHE(tl_inode), tl_bh,

						 OCFS2_JOURNAL_ACCESS_WRITE);

		if (status < 0) {

			mlog_errno(status);
@@ -6770,14 +6771,14 @@ static int ocfs2_do_truncate(struct ocfs2_super *osb, 
	 * Each component will be touched, so we might as well journal

	 * here to avoid having to handle errors later.

	 */

	status = ocfs2_journal_access_path(inode, handle, path);

	status = ocfs2_journal_access_path(INODE_CACHE(inode), handle, path);

	if (status < 0) {

		mlog_errno(status);

		goto bail;

	}



	if (last_eb_bh) {

		status = ocfs2_journal_access_eb(handle, inode, last_eb_bh,

		status = ocfs2_journal_access_eb(handle, INODE_CACHE(inode), last_eb_bh,

						 OCFS2_JOURNAL_ACCESS_WRITE);

		if (status < 0) {

			mlog_errno(status);
@@ -7139,7 +7140,7 @@ int ocfs2_convert_inline_data_to_extents(struct inode *inode, 
		goto out_unlock;

	}



	ret = ocfs2_journal_access_di(handle, inode, di_bh,

	ret = ocfs2_journal_access_di(handle, INODE_CACHE(inode), di_bh,

				      OCFS2_JOURNAL_ACCESS_WRITE);

	if (ret) {

		mlog_errno(ret);
@@ -7508,7 +7509,7 @@ int ocfs2_truncate_inline(struct inode *inode, struct buffer_head *di_bh, 
		goto out;

	}



	ret = ocfs2_journal_access_di(handle, inode, di_bh,

	ret = ocfs2_journal_access_di(handle, INODE_CACHE(inode), di_bh,

				      OCFS2_JOURNAL_ACCESS_WRITE);

	if (ret) {

		mlog_errno(ret);

fs/ocfs2/aops.c

+2 −2
Original line number Diff line number Diff line
@@ -1528,7 +1528,7 @@ static int ocfs2_write_begin_inline(struct address_space *mapping, 
		goto out;

	}



	ret = ocfs2_journal_access_di(handle, inode, wc->w_di_bh,

	ret = ocfs2_journal_access_di(handle, INODE_CACHE(inode), wc->w_di_bh,

				      OCFS2_JOURNAL_ACCESS_WRITE);

	if (ret) {

		ocfs2_commit_trans(osb, handle);
@@ -1773,7 +1773,7 @@ int ocfs2_write_begin_nolock(struct address_space *mapping, 
	 * We don't want this to fail in ocfs2_write_end(), so do it

	 * here.

	 */

	ret = ocfs2_journal_access_di(handle, inode, wc->w_di_bh,

	ret = ocfs2_journal_access_di(handle, INODE_CACHE(inode), wc->w_di_bh,

				      OCFS2_JOURNAL_ACCESS_WRITE);

	if (ret) {

		mlog_errno(ret);

fs/ocfs2/dir.c

+29 −23
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ static int ocfs2_dx_dir_link_trailer(struct inode *dir, handle_t *handle, 
	struct ocfs2_dx_root_block *dx_root;

	struct ocfs2_dir_block_trailer *trailer;



	ret = ocfs2_journal_access_dr(handle, dir, dx_root_bh,

	ret = ocfs2_journal_access_dr(handle, INODE_CACHE(dir), dx_root_bh,

				      OCFS2_JOURNAL_ACCESS_WRITE);

	if (ret) {

		mlog_errno(ret);
@@ -1136,7 +1136,8 @@ int ocfs2_update_entry(struct inode *dir, handle_t *handle, 
	if (OCFS2_I(dir)->ip_dyn_features & OCFS2_INLINE_DATA_FL)

		access = ocfs2_journal_access_di;



	ret = access(handle, dir, de_bh, OCFS2_JOURNAL_ACCESS_WRITE);

	ret = access(handle, INODE_CACHE(dir), de_bh,

		     OCFS2_JOURNAL_ACCESS_WRITE);

	if (ret) {

		mlog_errno(ret);

		goto out;
@@ -1179,7 +1180,7 @@ static int __ocfs2_delete_entry(handle_t *handle, struct inode *dir, 
			goto bail;

		}

		if (de == de_del)  {

			status = access(handle, dir, bh,

			status = access(handle, INODE_CACHE(dir), bh,

					OCFS2_JOURNAL_ACCESS_WRITE);

			if (status < 0) {

				status = -EIO;
@@ -1329,7 +1330,7 @@ static int ocfs2_delete_entry_dx(handle_t *handle, struct inode *dir, 
	 * the entry count needs to be updated. Also, we might be

	 * adding to the start of the free list.

	 */

	ret = ocfs2_journal_access_dr(handle, dir, dx_root_bh,

	ret = ocfs2_journal_access_dr(handle, INODE_CACHE(dir), dx_root_bh,

				      OCFS2_JOURNAL_ACCESS_WRITE);

	if (ret) {

		mlog_errno(ret);
@@ -1337,7 +1338,7 @@ static int ocfs2_delete_entry_dx(handle_t *handle, struct inode *dir, 
	}



	if (!ocfs2_dx_root_inline(dx_root)) {

		ret = ocfs2_journal_access_dl(handle, dir,

		ret = ocfs2_journal_access_dl(handle, INODE_CACHE(dir),

					      lookup->dl_dx_leaf_bh,

					      OCFS2_JOURNAL_ACCESS_WRITE);

		if (ret) {
@@ -1496,7 +1497,7 @@ static int __ocfs2_dx_dir_leaf_insert(struct inode *dir, handle_t *handle, 
	int ret;

	struct ocfs2_dx_leaf *dx_leaf;



	ret = ocfs2_journal_access_dl(handle, dir, dx_leaf_bh,

	ret = ocfs2_journal_access_dl(handle, INODE_CACHE(dir), dx_leaf_bh,

				      OCFS2_JOURNAL_ACCESS_WRITE);

	if (ret) {

		mlog_errno(ret);
@@ -1526,7 +1527,7 @@ static int ocfs2_dx_dir_insert(struct inode *dir, handle_t *handle, 
	struct ocfs2_dx_root_block *dx_root;

	struct buffer_head *dx_root_bh = lookup->dl_dx_root_bh;



	ret = ocfs2_journal_access_dr(handle, dir, dx_root_bh,

	ret = ocfs2_journal_access_dr(handle, INODE_CACHE(dir), dx_root_bh,

				      OCFS2_JOURNAL_ACCESS_WRITE);

	if (ret) {

		mlog_errno(ret);
@@ -1648,11 +1649,13 @@ int __ocfs2_add_entry(handle_t *handle, 
		 */

		if (ocfs2_free_list_at_root(lookup)) {

			bh = lookup->dl_dx_root_bh;

			retval = ocfs2_journal_access_dr(handle, dir, bh,

			retval = ocfs2_journal_access_dr(handle,

						 INODE_CACHE(dir), bh,

						 OCFS2_JOURNAL_ACCESS_WRITE);

		} else {

			bh = lookup->dl_prev_leaf_bh;

			retval = ocfs2_journal_access_db(handle, dir, bh,

			retval = ocfs2_journal_access_db(handle,

						 INODE_CACHE(dir), bh,

						 OCFS2_JOURNAL_ACCESS_WRITE);

		}

		if (retval) {
@@ -1703,11 +1706,13 @@ int __ocfs2_add_entry(handle_t *handle, 
			}



			if (insert_bh == parent_fe_bh)

				status = ocfs2_journal_access_di(handle, dir,

				status = ocfs2_journal_access_di(handle,

								 INODE_CACHE(dir),

								 insert_bh,

								 OCFS2_JOURNAL_ACCESS_WRITE);

			else {

				status = ocfs2_journal_access_db(handle, dir,

				status = ocfs2_journal_access_db(handle,

								 INODE_CACHE(dir),

								 insert_bh,

					      OCFS2_JOURNAL_ACCESS_WRITE);
@@ -2283,7 +2288,7 @@ static int ocfs2_fill_new_dir_id(struct ocfs2_super *osb, 
	struct ocfs2_inline_data *data = &di->id2.i_data;

	unsigned int size = le16_to_cpu(data->id_count);



	ret = ocfs2_journal_access_di(handle, inode, di_bh,

	ret = ocfs2_journal_access_di(handle, INODE_CACHE(inode), di_bh,

				      OCFS2_JOURNAL_ACCESS_WRITE);

	if (ret) {

		mlog_errno(ret);
@@ -2337,7 +2342,7 @@ static int ocfs2_fill_new_dir_el(struct ocfs2_super *osb, 


	ocfs2_set_new_buffer_uptodate(INODE_CACHE(inode), new_bh);



	status = ocfs2_journal_access_db(handle, inode, new_bh,

	status = ocfs2_journal_access_db(handle, INODE_CACHE(inode), new_bh,

					 OCFS2_JOURNAL_ACCESS_CREATE);

	if (status < 0) {

		mlog_errno(status);
@@ -2423,7 +2428,7 @@ static int ocfs2_dx_dir_attach_index(struct ocfs2_super *osb, 
	}

	ocfs2_set_new_buffer_uptodate(INODE_CACHE(dir), dx_root_bh);



	ret = ocfs2_journal_access_dr(handle, dir, dx_root_bh,

	ret = ocfs2_journal_access_dr(handle, INODE_CACHE(dir), dx_root_bh,

				      OCFS2_JOURNAL_ACCESS_CREATE);

	if (ret < 0) {

		mlog_errno(ret);
@@ -2457,7 +2462,7 @@ static int ocfs2_dx_dir_attach_index(struct ocfs2_super *osb, 
	if (ret)

		mlog_errno(ret);



	ret = ocfs2_journal_access_di(handle, dir, di_bh,

	ret = ocfs2_journal_access_di(handle, INODE_CACHE(dir), di_bh,

				      OCFS2_JOURNAL_ACCESS_CREATE);

	if (ret) {

		mlog_errno(ret);
@@ -2500,7 +2505,7 @@ static int ocfs2_dx_dir_format_cluster(struct ocfs2_super *osb, 


		ocfs2_set_new_buffer_uptodate(INODE_CACHE(dir), bh);



		ret = ocfs2_journal_access_dl(handle, dir, bh,

		ret = ocfs2_journal_access_dl(handle, INODE_CACHE(dir), bh,

					      OCFS2_JOURNAL_ACCESS_CREATE);

		if (ret < 0) {

			mlog_errno(ret);
@@ -3010,7 +3015,7 @@ static int ocfs2_expand_inline_dir(struct inode *dir, struct buffer_head *di_bh, 


	ocfs2_set_new_buffer_uptodate(INODE_CACHE(dir), dirdata_bh);



	ret = ocfs2_journal_access_db(handle, dir, dirdata_bh,

	ret = ocfs2_journal_access_db(handle, INODE_CACHE(dir), dirdata_bh,

				      OCFS2_JOURNAL_ACCESS_CREATE);

	if (ret) {

		mlog_errno(ret);
@@ -3063,7 +3068,7 @@ static int ocfs2_expand_inline_dir(struct inode *dir, struct buffer_head *di_bh, 
	 * We let the later dirent insert modify c/mtime - to the user

	 * the data hasn't changed.

	 */

	ret = ocfs2_journal_access_di(handle, dir, di_bh,

	ret = ocfs2_journal_access_di(handle, INODE_CACHE(dir), di_bh,

				      OCFS2_JOURNAL_ACCESS_CREATE);

	if (ret) {

		mlog_errno(ret);
@@ -3392,7 +3397,7 @@ static int ocfs2_extend_dir(struct ocfs2_super *osb, 


	ocfs2_set_new_buffer_uptodate(INODE_CACHE(dir), new_bh);



	status = ocfs2_journal_access_db(handle, dir, new_bh,

	status = ocfs2_journal_access_db(handle, INODE_CACHE(dir), new_bh,

					 OCFS2_JOURNAL_ACCESS_CREATE);

	if (status < 0) {

		mlog_errno(status);
@@ -3888,7 +3893,7 @@ static int ocfs2_dx_dir_rebalance(struct ocfs2_super *osb, struct inode *dir, 
	}

	did_quota = 1;



	ret = ocfs2_journal_access_dl(handle, dir, dx_leaf_bh,

	ret = ocfs2_journal_access_dl(handle, INODE_CACHE(dir), dx_leaf_bh,

				      OCFS2_JOURNAL_ACCESS_WRITE);

	if (ret) {

		mlog_errno(ret);
@@ -3952,7 +3957,8 @@ static int ocfs2_dx_dir_rebalance(struct ocfs2_super *osb, struct inode *dir, 
	}



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

		ret = ocfs2_journal_access_dl(handle, dir, orig_dx_leaves[i],

		ret = ocfs2_journal_access_dl(handle, INODE_CACHE(dir),

					      orig_dx_leaves[i],

					      OCFS2_JOURNAL_ACCESS_WRITE);

		if (ret) {

			mlog_errno(ret);
@@ -4168,7 +4174,7 @@ static int ocfs2_expand_inline_dx_root(struct inode *dir, 
	 * failure to add the dx_root_bh to the journal won't result

	 * us losing clusters.

	 */

	ret = ocfs2_journal_access_dr(handle, dir, dx_root_bh,

	ret = ocfs2_journal_access_dr(handle, INODE_CACHE(dir), dx_root_bh,

				      OCFS2_JOURNAL_ACCESS_WRITE);

	if (ret) {

		mlog_errno(ret);
@@ -4472,7 +4478,7 @@ static int ocfs2_dx_dir_remove_index(struct inode *dir, 
		goto out_unlock;

	}



	ret = ocfs2_journal_access_di(handle, dir, di_bh,

	ret = ocfs2_journal_access_di(handle, INODE_CACHE(dir), di_bh,

				      OCFS2_JOURNAL_ACCESS_WRITE);

	if (ret) {

		mlog_errno(ret);

fs/ocfs2/dlmglue.c

+1 −1
Original line number Diff line number Diff line
@@ -3499,7 +3499,7 @@ static int ocfs2_check_meta_downconvert(struct ocfs2_lock_res *lockres, 
					int new_level)

{

	struct inode *inode = ocfs2_lock_res_inode(lockres);

	int checkpointed = ocfs2_inode_fully_checkpointed(inode);

	int checkpointed = ocfs2_ci_fully_checkpointed(INODE_CACHE(inode));



	BUG_ON(new_level != DLM_LOCK_NL && new_level != DLM_LOCK_PR);

	BUG_ON(lockres->l_level != DLM_LOCK_EX && !checkpointed);

fs/ocfs2/file.c

+4 −4
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ int ocfs2_update_inode_atime(struct inode *inode, 
		goto out;

	}



	ret = ocfs2_journal_access_di(handle, inode, bh,

	ret = ocfs2_journal_access_di(handle, INODE_CACHE(inode), bh,

				      OCFS2_JOURNAL_ACCESS_WRITE);

	if (ret) {

		mlog_errno(ret);
@@ -356,7 +356,7 @@ static int ocfs2_orphan_for_truncate(struct ocfs2_super *osb, 
		goto out;

	}



	status = ocfs2_journal_access_di(handle, inode, fe_bh,

	status = ocfs2_journal_access_di(handle, INODE_CACHE(inode), fe_bh,

					 OCFS2_JOURNAL_ACCESS_WRITE);

	if (status < 0) {

		mlog_errno(status);
@@ -593,7 +593,7 @@ static int __ocfs2_extend_allocation(struct inode *inode, u32 logical_start, 
	/* reserve a write to the file entry early on - that we if we

	 * run out of credits in the allocation path, we can still

	 * update i_size. */

	status = ocfs2_journal_access_di(handle, inode, bh,

	status = ocfs2_journal_access_di(handle, INODE_CACHE(inode), bh,

					 OCFS2_JOURNAL_ACCESS_WRITE);

	if (status < 0) {

		mlog_errno(status);
@@ -1131,7 +1131,7 @@ static int __ocfs2_write_remove_suid(struct inode *inode, 
		goto out;

	}



	ret = ocfs2_journal_access_di(handle, inode, bh,

	ret = ocfs2_journal_access_di(handle, INODE_CACHE(inode), bh,

				      OCFS2_JOURNAL_ACCESS_WRITE);

	if (ret < 0) {

		mlog_errno(ret);