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

Commit 13723d00 authored by Joel Becker's avatar Joel Becker Committed by Mark Fasheh
Browse files

ocfs2: Use metadata-specific ocfs2_journal_access_*() functions. 



The per-metadata-type ocfs2_journal_access_*() functions hook up jbd2
commit triggers and allow us to compute metadata ecc right before the
buffers are written out.  This commit provides ecc for inodes, extent
blocks, group descriptors, and quota blocks.  It is not safe to use
extened attributes and metaecc at the same time yet.

The ocfs2_extent_tree and ocfs2_path abstractions in alloc.c both hide
the type of block at their root.  Before, it didn't matter, but now the
root block must use the appropriate ocfs2_journal_access_*() function.
To keep this abstract, the structures now have a pointer to the matching
journal_access function and a wrapper call to call it.

A few places use naked ocfs2_write_block() calls instead of adding the
blocks to the journal.  We make sure to calculate their checksum and ecc
before the write.

Since we pass around the journal_access functions.  Let's typedef them
in ocfs2.h.

Signed-off-by: default avatarJoel Becker <joel.becker@oracle.com>
Signed-off-by: default avatarMark Fasheh <mfasheh@suse.com>
parent ffdd7a54

fs/ocfs2/alloc.c

+137 −96
Original line number Diff line number Diff line
@@ -298,11 +298,13 @@ static struct ocfs2_extent_tree_operations ocfs2_xattr_tree_et_ops = { 
static void __ocfs2_init_extent_tree(struct ocfs2_extent_tree *et,

				     struct inode *inode,

				     struct buffer_head *bh,

				     ocfs2_journal_access_func access,

				     void *obj,

				     struct ocfs2_extent_tree_operations *ops)

{

	et->et_ops = ops;

	et->et_root_bh = bh;

	et->et_root_journal_access = access;

	if (!obj)

		obj = (void *)bh->b_data;

	et->et_object = obj;
@@ -318,15 +320,16 @@ void ocfs2_init_dinode_extent_tree(struct ocfs2_extent_tree *et, 
				   struct inode *inode,

				   struct buffer_head *bh)

{

	__ocfs2_init_extent_tree(et, inode, bh, NULL, &ocfs2_dinode_et_ops);

	__ocfs2_init_extent_tree(et, inode, bh, ocfs2_journal_access_di,

				 NULL, &ocfs2_dinode_et_ops);

}



void ocfs2_init_xattr_tree_extent_tree(struct ocfs2_extent_tree *et,

				       struct inode *inode,

				       struct buffer_head *bh)

{

	__ocfs2_init_extent_tree(et, inode, bh, NULL,

				 &ocfs2_xattr_tree_et_ops);

	__ocfs2_init_extent_tree(et, inode, bh, ocfs2_journal_access_xb,

				 NULL, &ocfs2_xattr_tree_et_ops);

}



void ocfs2_init_xattr_value_extent_tree(struct ocfs2_extent_tree *et,
@@ -334,7 +337,7 @@ void ocfs2_init_xattr_value_extent_tree(struct ocfs2_extent_tree *et, 
					struct buffer_head *bh,

					struct ocfs2_xattr_value_root *xv)

{

	__ocfs2_init_extent_tree(et, inode, bh, xv,

	__ocfs2_init_extent_tree(et, inode, bh, ocfs2_journal_access, xv,

				 &ocfs2_xattr_value_et_ops);

}
@@ -356,6 +359,15 @@ static inline void ocfs2_et_update_clusters(struct inode *inode, 
	et->et_ops->eo_update_clusters(inode, et, clusters);

}



static inline int ocfs2_et_root_journal_access(handle_t *handle,

					       struct inode *inode,

					       struct ocfs2_extent_tree *et,

					       int type)

{

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

					  type);

}



static inline int ocfs2_et_insert_check(struct inode *inode,

					struct ocfs2_extent_tree *et,

					struct ocfs2_extent_rec *rec)
@@ -397,11 +409,13 @@ struct ocfs2_path_item { 


struct ocfs2_path {

	int				p_tree_depth;

	ocfs2_journal_access_func	p_root_access;

	struct ocfs2_path_item		p_node[OCFS2_MAX_PATH_DEPTH];

};



#define path_root_bh(_path) ((_path)->p_node[0].bh)

#define path_root_el(_path) ((_path)->p_node[0].el)

#define path_root_access(_path)((_path)->p_root_access)

#define path_leaf_bh(_path) ((_path)->p_node[(_path)->p_tree_depth].bh)

#define path_leaf_el(_path) ((_path)->p_node[(_path)->p_tree_depth].el)

#define path_num_items(_path) ((_path)->p_tree_depth + 1)
@@ -434,6 +448,8 @@ static void ocfs2_reinit_path(struct ocfs2_path *path, int keep_root) 
	 */

	if (keep_root)

		depth = le16_to_cpu(path_root_el(path)->l_tree_depth);

	else

		path_root_access(path) = NULL;



	path->p_tree_depth = depth;

}
@@ -459,6 +475,7 @@ static void ocfs2_cp_path(struct ocfs2_path *dest, struct ocfs2_path *src) 


	BUG_ON(path_root_bh(dest) != path_root_bh(src));

	BUG_ON(path_root_el(dest) != path_root_el(src));

	BUG_ON(path_root_access(dest) != path_root_access(src));



	ocfs2_reinit_path(dest, 1);
@@ -480,6 +497,7 @@ static void ocfs2_mv_path(struct ocfs2_path *dest, struct ocfs2_path *src) 
	int i;



	BUG_ON(path_root_bh(dest) != path_root_bh(src));

	BUG_ON(path_root_access(dest) != path_root_access(src));



	for(i = 1; i < OCFS2_MAX_PATH_DEPTH; i++) {

		brelse(dest->p_node[i].bh);
@@ -515,7 +533,8 @@ static inline void ocfs2_path_insert_eb(struct ocfs2_path *path, int index, 
}



static struct ocfs2_path *ocfs2_new_path(struct buffer_head *root_bh,

					 struct ocfs2_extent_list *root_el)

					 struct ocfs2_extent_list *root_el,

					 ocfs2_journal_access_func access)

{

	struct ocfs2_path *path;
@@ -527,6 +546,7 @@ static struct ocfs2_path *ocfs2_new_path(struct buffer_head *root_bh, 
		get_bh(root_bh);

		path_root_bh(path) = root_bh;

		path_root_el(path) = root_el;

		path_root_access(path) = access;

	}



	return path;
@@ -534,12 +554,38 @@ static struct ocfs2_path *ocfs2_new_path(struct buffer_head *root_bh, 


static struct ocfs2_path *ocfs2_new_path_from_path(struct ocfs2_path *path)

{

	return ocfs2_new_path(path_root_bh(path), path_root_el(path));

	return ocfs2_new_path(path_root_bh(path), path_root_el(path),

			      path_root_access(path));

}



static struct ocfs2_path *ocfs2_new_path_from_et(struct ocfs2_extent_tree *et)

{

	return ocfs2_new_path(et->et_root_bh, et->et_root_el);

	return ocfs2_new_path(et->et_root_bh, et->et_root_el,

			      et->et_root_journal_access);

}



/*

 * Journal the buffer at depth idx.  All idx>0 are extent_blocks,

 * otherwise it's the root_access function.

 *

 * I don't like the way this function's name looks next to

 * 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_path *path,

					int idx)

{

	ocfs2_journal_access_func access = path_root_access(path);



	if (!access)

		access = ocfs2_journal_access;



	if (idx)

		access = ocfs2_journal_access_eb;



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

		      OCFS2_JOURNAL_ACCESS_WRITE);

}



/*
@@ -554,8 +600,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_journal_access(handle, inode, path->p_node[i].bh,

					   OCFS2_JOURNAL_ACCESS_WRITE);

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

		if (ret < 0) {

			mlog_errno(ret);

			goto out;
@@ -708,8 +753,11 @@ static int ocfs2_validate_extent_block(struct super_block *sb, 
	 * local to this block.

	 */

	rc = ocfs2_validate_meta_ecc(sb, bh->b_data, &eb->h_check);

	if (rc)

	if (rc) {

		mlog(ML_ERROR, "Checksum failed for extent block %llu\n",

		     (unsigned long long)bh->b_blocknr);

		return rc;

	}



	/*

	 * Errors after here are fatal.
@@ -842,7 +890,7 @@ static int ocfs2_create_new_meta_bhs(struct ocfs2_super *osb, 
			}

			ocfs2_set_new_buffer_uptodate(inode, bhs[i]);



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

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

							 OCFS2_JOURNAL_ACCESS_CREATE);

			if (status < 0) {

				mlog_errno(status);
@@ -986,7 +1034,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(handle, inode, bh,

		status = ocfs2_journal_access_eb(handle, inode, bh,

						 OCFS2_JOURNAL_ACCESS_CREATE);

		if (status < 0) {

			mlog_errno(status);
@@ -1026,20 +1074,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(handle, inode, *last_eb_bh,

	status = ocfs2_journal_access_eb(handle, inode, *last_eb_bh,

					 OCFS2_JOURNAL_ACCESS_WRITE);

	if (status < 0) {

		mlog_errno(status);

		goto bail;

	}

	status = ocfs2_journal_access(handle, inode, et->et_root_bh,

	status = ocfs2_et_root_journal_access(handle, inode, et,

					      OCFS2_JOURNAL_ACCESS_WRITE);

	if (status < 0) {

		mlog_errno(status);

		goto bail;

	}

	if (eb_bh) {

		status = ocfs2_journal_access(handle, inode, eb_bh,

		status = ocfs2_journal_access_eb(handle, inode, eb_bh,

						 OCFS2_JOURNAL_ACCESS_WRITE);

		if (status < 0) {

			mlog_errno(status);
@@ -1129,7 +1177,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(handle, inode, new_eb_bh,

	status = ocfs2_journal_access_eb(handle, inode, new_eb_bh,

					 OCFS2_JOURNAL_ACCESS_CREATE);

	if (status < 0) {

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

	}



	status = ocfs2_journal_access(handle, inode, et->et_root_bh,

	status = ocfs2_et_root_journal_access(handle, inode, et,

					      OCFS2_JOURNAL_ACCESS_WRITE);

	if (status < 0) {

		mlog_errno(status);
@@ -1918,25 +1966,23 @@ 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_journal_access(handle, inode, root_bh,

				   OCFS2_JOURNAL_ACCESS_WRITE);

	ret = ocfs2_path_bh_journal_access(handle, inode, right_path,

					   subtree_index);

	if (ret) {

		mlog_errno(ret);

		goto out;

	}



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

		ret = ocfs2_journal_access(handle, inode,

					   right_path->p_node[i].bh,

					   OCFS2_JOURNAL_ACCESS_WRITE);

		ret = ocfs2_path_bh_journal_access(handle, inode,

						   right_path, i);

		if (ret) {

			mlog_errno(ret);

			goto out;

		}



		ret = ocfs2_journal_access(handle, inode,

					   left_path->p_node[i].bh,

					   OCFS2_JOURNAL_ACCESS_WRITE);

		ret = ocfs2_path_bh_journal_access(handle, inode,

						   left_path, i);

		if (ret) {

			mlog_errno(ret);

			goto out;
@@ -2455,7 +2501,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(handle, inode,

			ret = ocfs2_journal_access_eb(handle, inode,

						      path_leaf_bh(right_path),

						      OCFS2_JOURNAL_ACCESS_WRITE);

			if (ret) {
@@ -2474,7 +2520,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_journal_access(handle, inode, et_root_bh,

		ret = ocfs2_et_root_journal_access(handle, inode, et,

						   OCFS2_JOURNAL_ACCESS_WRITE);

		if (ret) {

			mlog_errno(ret);
@@ -2490,25 +2536,23 @@ static int ocfs2_rotate_subtree_left(struct inode *inode, handle_t *handle, 
	 */

	BUG_ON(right_has_empty && !del_right_subtree);



	ret = ocfs2_journal_access(handle, inode, root_bh,

				   OCFS2_JOURNAL_ACCESS_WRITE);

	ret = ocfs2_path_bh_journal_access(handle, inode, right_path,

					   subtree_index);

	if (ret) {

		mlog_errno(ret);

		goto out;

	}



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

		ret = ocfs2_journal_access(handle, inode,

					   right_path->p_node[i].bh,

					   OCFS2_JOURNAL_ACCESS_WRITE);

		ret = ocfs2_path_bh_journal_access(handle, inode,

						   right_path, i);

		if (ret) {

			mlog_errno(ret);

			goto out;

		}



		ret = ocfs2_journal_access(handle, inode,

					   left_path->p_node[i].bh,

					   OCFS2_JOURNAL_ACCESS_WRITE);

		ret = ocfs2_path_bh_journal_access(handle, inode,

						   left_path, i);

		if (ret) {

			mlog_errno(ret);

			goto out;
@@ -2653,16 +2697,17 @@ static int ocfs2_find_cpos_for_right_leaf(struct super_block *sb, 


static int ocfs2_rotate_rightmost_leaf_left(struct inode *inode,

					    handle_t *handle,

					    struct buffer_head *bh,

					    struct ocfs2_extent_list *el)

					    struct ocfs2_path *path)

{

	int ret;

	struct buffer_head *bh = path_leaf_bh(path);

	struct ocfs2_extent_list *el = path_leaf_el(path);



	if (!ocfs2_is_empty_extent(&el->l_recs[0]))

		return 0;



	ret = ocfs2_journal_access(handle, inode, bh,

				   OCFS2_JOURNAL_ACCESS_WRITE);

	ret = ocfs2_path_bh_journal_access(handle, inode, path,

					   path_num_items(path) - 1);

	if (ret) {

		mlog_errno(ret);

		goto out;
@@ -2744,9 +2789,8 @@ 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_journal_access(handle, inode,

					   path_root_bh(left_path),

					   OCFS2_JOURNAL_ACCESS_WRITE);

		ret = ocfs2_path_bh_journal_access(handle, inode,

						   left_path, 0);

		if (ret) {

			mlog_errno(ret);

			goto out;
@@ -2929,8 +2973,7 @@ static int ocfs2_rotate_tree_left(struct inode *inode, handle_t *handle, 
		 * it up front.

		 */

		ret = ocfs2_rotate_rightmost_leaf_left(inode, handle,

						       path_leaf_bh(path),

						       path_leaf_el(path));

						       path);

		if (ret)

			mlog_errno(ret);

		goto out;
@@ -3164,8 +3207,8 @@ 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_journal_access(handle, inode, root_bh,

					   OCFS2_JOURNAL_ACCESS_WRITE);

		ret = ocfs2_path_bh_journal_access(handle, inode, right_path,

						   subtree_index);

		if (ret) {

			mlog_errno(ret);

			goto out;
@@ -3173,17 +3216,15 @@ static int ocfs2_merge_rec_right(struct inode *inode, 


		for (i = subtree_index + 1;

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

			ret = ocfs2_journal_access(handle, inode,

						   right_path->p_node[i].bh,

						   OCFS2_JOURNAL_ACCESS_WRITE);

			ret = ocfs2_path_bh_journal_access(handle, inode,

							   right_path, i);

			if (ret) {

				mlog_errno(ret);

				goto out;

			}



			ret = ocfs2_journal_access(handle, inode,

						   left_path->p_node[i].bh,

						   OCFS2_JOURNAL_ACCESS_WRITE);

			ret = ocfs2_path_bh_journal_access(handle, inode,

							   left_path, i);

			if (ret) {

				mlog_errno(ret);

				goto out;
@@ -3195,8 +3236,8 @@ static int ocfs2_merge_rec_right(struct inode *inode, 
		right_rec = &el->l_recs[index + 1];

	}



	ret = ocfs2_journal_access(handle, inode, bh,

				   OCFS2_JOURNAL_ACCESS_WRITE);

	ret = ocfs2_path_bh_journal_access(handle, inode, left_path,

					   path_num_items(left_path) - 1);

	if (ret) {

		mlog_errno(ret);

		goto out;
@@ -3335,8 +3376,8 @@ 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_journal_access(handle, inode, root_bh,

					   OCFS2_JOURNAL_ACCESS_WRITE);

		ret = ocfs2_path_bh_journal_access(handle, inode, right_path,

						   subtree_index);

		if (ret) {

			mlog_errno(ret);

			goto out;
@@ -3344,17 +3385,15 @@ static int ocfs2_merge_rec_left(struct inode *inode, 


		for (i = subtree_index + 1;

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

			ret = ocfs2_journal_access(handle, inode,

						   right_path->p_node[i].bh,

						   OCFS2_JOURNAL_ACCESS_WRITE);

			ret = ocfs2_path_bh_journal_access(handle, inode,

							   right_path, i);

			if (ret) {

				mlog_errno(ret);

				goto out;

			}



			ret = ocfs2_journal_access(handle, inode,

						   left_path->p_node[i].bh,

						   OCFS2_JOURNAL_ACCESS_WRITE);

			ret = ocfs2_path_bh_journal_access(handle, inode,

							   left_path, i);

			if (ret) {

				mlog_errno(ret);

				goto out;
@@ -3366,8 +3405,8 @@ static int ocfs2_merge_rec_left(struct inode *inode, 
			has_empty_extent = 1;

	}



	ret = ocfs2_journal_access(handle, inode, bh,

				   OCFS2_JOURNAL_ACCESS_WRITE);

	ret = ocfs2_path_bh_journal_access(handle, inode, left_path,

					   path_num_items(left_path) - 1);

	if (ret) {

		mlog_errno(ret);

		goto out;
@@ -4009,7 +4048,7 @@ static int ocfs2_do_insert_extent(struct inode *inode, 


	el = et->et_root_el;



	ret = ocfs2_journal_access(handle, inode, et->et_root_bh,

	ret = ocfs2_et_root_journal_access(handle, inode, et,

					   OCFS2_JOURNAL_ACCESS_WRITE);

	if (ret) {

		mlog_errno(ret);
@@ -4071,7 +4110,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_journal_access(handle, inode, et->et_root_bh,

		ret = ocfs2_et_root_journal_access(handle, inode, et,

						   OCFS2_JOURNAL_ACCESS_WRITE);

		if (ret) {

			mlog_errno(ret);
@@ -4593,8 +4632,8 @@ 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 inode */

	status = ocfs2_journal_access(handle, inode, et->et_root_bh,

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

	status = ocfs2_et_root_journal_access(handle, inode, et,

					      OCFS2_JOURNAL_ACCESS_WRITE);

	if (status < 0) {

		mlog_errno(status);
@@ -5347,7 +5386,7 @@ int ocfs2_remove_btree_range(struct inode *inode, 
		goto out;

	}



	ret = ocfs2_journal_access(handle, inode, et->et_root_bh,

	ret = ocfs2_et_root_journal_access(handle, inode, et,

					   OCFS2_JOURNAL_ACCESS_WRITE);

	if (ret) {

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

	}



	status = ocfs2_journal_access(handle, tl_inode, tl_bh,

	status = ocfs2_journal_access_di(handle, tl_inode, tl_bh,

					 OCFS2_JOURNAL_ACCESS_WRITE);

	if (status < 0) {

		mlog_errno(status);
@@ -5523,7 +5562,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(handle, tl_inode, tl_bh,

		status = ocfs2_journal_access_di(handle, tl_inode, tl_bh,

						 OCFS2_JOURNAL_ACCESS_WRITE);

		if (status < 0) {

			mlog_errno(status);
@@ -5780,6 +5819,7 @@ int ocfs2_begin_truncate_log_recovery(struct ocfs2_super *osb, 
		 * tl_used. */

		tl->tl_used = 0;



		ocfs2_compute_meta_ecc(osb->sb, tl_bh->b_data, &di->i_check);

		status = ocfs2_write_block(osb, tl_bh, tl_inode);

		if (status < 0) {

			mlog_errno(status);
@@ -6546,7 +6586,7 @@ static int ocfs2_do_truncate(struct ocfs2_super *osb, 
	}



	if (last_eb_bh) {

		status = ocfs2_journal_access(handle, inode, last_eb_bh,

		status = ocfs2_journal_access_eb(handle, inode, last_eb_bh,

						 OCFS2_JOURNAL_ACCESS_WRITE);

		if (status < 0) {

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

	}



	ret = ocfs2_journal_access(handle, inode, di_bh,

	ret = ocfs2_journal_access_di(handle, inode, di_bh,

				      OCFS2_JOURNAL_ACCESS_WRITE);

	if (ret) {

		mlog_errno(ret);
@@ -7043,7 +7083,8 @@ int ocfs2_commit_truncate(struct ocfs2_super *osb, 
	new_highest_cpos = ocfs2_clusters_for_bytes(osb->sb,

						     i_size_read(inode));



	path = ocfs2_new_path(fe_bh, &di->id2.i_list);

	path = ocfs2_new_path(fe_bh, &di->id2.i_list,

			      ocfs2_journal_access_di);

	if (!path) {

		status = -ENOMEM;

		mlog_errno(status);
@@ -7276,7 +7317,7 @@ int ocfs2_truncate_inline(struct inode *inode, struct buffer_head *di_bh, 
		goto out;

	}



	ret = ocfs2_journal_access(handle, inode, di_bh,

	ret = ocfs2_journal_access_di(handle, inode, di_bh,

				      OCFS2_JOURNAL_ACCESS_WRITE);

	if (ret) {

		mlog_errno(ret);

fs/ocfs2/alloc.h

+4 −1
Original line number Diff line number Diff line
@@ -45,7 +45,9 @@ 
 *

 * ocfs2_extent_tree contains info for the root of the b-tree, it must have a

 * root ocfs2_extent_list and a root_bh so that they can be used in the b-tree

 * functions.

 * functions.  With metadata ecc, we now call different journal_access

 * functions for each type of metadata, so it must have the

 * root_journal_access function.

 * ocfs2_extent_tree_operations abstract the normal operations we do for

 * the root of extent b-tree.

 */
@@ -54,6 +56,7 @@ struct ocfs2_extent_tree { 
	struct ocfs2_extent_tree_operations	*et_ops;

	struct buffer_head			*et_root_bh;

	struct ocfs2_extent_list		*et_root_el;

	ocfs2_journal_access_func		et_root_journal_access;

	void					*et_object;

	unsigned int				et_max_leaf_clusters;

};

fs/ocfs2/aops.c

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

	}



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

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

				      OCFS2_JOURNAL_ACCESS_WRITE);

	if (ret) {

		ocfs2_commit_trans(osb, handle);
@@ -1740,7 +1740,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(handle, inode, wc->w_di_bh,

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

				      OCFS2_JOURNAL_ACCESS_WRITE);

	if (ret) {

		mlog_errno(ret);

fs/ocfs2/dir.c

+31 −17
Original line number Diff line number Diff line
@@ -378,14 +378,18 @@ int ocfs2_update_entry(struct inode *dir, handle_t *handle, 
		       struct inode *new_entry_inode)

{

	int ret;

	ocfs2_journal_access_func access = ocfs2_journal_access_db;



	/*

	 * The same code works fine for both inline-data and extent

	 * based directories, so no need to split this up.

	 * based directories, so no need to split this up.  The only

	 * difference is the journal_access function.

	 */



	ret = ocfs2_journal_access(handle, dir, de_bh,

				   OCFS2_JOURNAL_ACCESS_WRITE);

	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);

	if (ret) {

		mlog_errno(ret);

		goto out;
@@ -407,9 +411,13 @@ static int __ocfs2_delete_entry(handle_t *handle, struct inode *dir, 
{

	struct ocfs2_dir_entry *de, *pde;

	int i, status = -ENOENT;

	ocfs2_journal_access_func access = ocfs2_journal_access_db;



	mlog_entry("(0x%p, 0x%p, 0x%p, 0x%p)\n", handle, dir, de_del, bh);



	if (OCFS2_I(dir)->ip_dyn_features & OCFS2_INLINE_DATA_FL)

		access = ocfs2_journal_access_di;



	i = 0;

	pde = NULL;

	de = (struct ocfs2_dir_entry *) first_de;
@@ -420,7 +428,7 @@ static int __ocfs2_delete_entry(handle_t *handle, struct inode *dir, 
			goto bail;

		}

		if (de == de_del)  {

			status = ocfs2_journal_access(handle, dir, bh,

			status = access(handle, dir, bh,

					OCFS2_JOURNAL_ACCESS_WRITE);

			if (status < 0) {

				status = -EIO;
@@ -581,7 +589,13 @@ int __ocfs2_add_entry(handle_t *handle, 
				goto bail;

			}



			status = ocfs2_journal_access(handle, dir, insert_bh,

			if (insert_bh == parent_fe_bh)

				status = ocfs2_journal_access_di(handle, dir,

								 insert_bh,

								 OCFS2_JOURNAL_ACCESS_WRITE);

			else

				status = ocfs2_journal_access_db(handle, dir,

								 insert_bh,

								 OCFS2_JOURNAL_ACCESS_WRITE);

			/* By now the buffer is marked for journaling */

			offset += le16_to_cpu(de->rec_len);
@@ -1081,7 +1095,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(handle, inode, di_bh,

	ret = ocfs2_journal_access_di(handle, inode, di_bh,

				      OCFS2_JOURNAL_ACCESS_WRITE);

	if (ret) {

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


	ocfs2_set_new_buffer_uptodate(inode, new_bh);



	status = ocfs2_journal_access(handle, inode, new_bh,

	status = ocfs2_journal_access_db(handle, inode, new_bh,

					 OCFS2_JOURNAL_ACCESS_CREATE);

	if (status < 0) {

		mlog_errno(status);
@@ -1292,7 +1306,7 @@ static int ocfs2_expand_inline_dir(struct inode *dir, struct buffer_head *di_bh, 


	ocfs2_set_new_buffer_uptodate(dir, dirdata_bh);



	ret = ocfs2_journal_access(handle, dir, dirdata_bh,

	ret = ocfs2_journal_access_db(handle, dir, dirdata_bh,

				      OCFS2_JOURNAL_ACCESS_CREATE);

	if (ret) {

		mlog_errno(ret);
@@ -1319,7 +1333,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(handle, dir, di_bh,

	ret = ocfs2_journal_access_di(handle, dir, di_bh,

				      OCFS2_JOURNAL_ACCESS_CREATE);

	if (ret) {

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


	ocfs2_set_new_buffer_uptodate(dir, new_bh);



	status = ocfs2_journal_access(handle, dir, new_bh,

	status = ocfs2_journal_access_db(handle, dir, new_bh,

					 OCFS2_JOURNAL_ACCESS_CREATE);

	if (status < 0) {

		mlog_errno(status);

fs/ocfs2/file.c

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

	}



	ret = ocfs2_journal_access(handle, inode, bh,

	ret = ocfs2_journal_access_di(handle, inode, bh,

				      OCFS2_JOURNAL_ACCESS_WRITE);

	if (ret) {

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

	}



	status = ocfs2_journal_access(handle, inode, fe_bh,

	status = ocfs2_journal_access_di(handle, inode, fe_bh,

					 OCFS2_JOURNAL_ACCESS_WRITE);

	if (status < 0) {

		mlog_errno(status);
@@ -590,7 +590,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(handle, inode, bh,

	status = ocfs2_journal_access_di(handle, inode, bh,

					 OCFS2_JOURNAL_ACCESS_WRITE);

	if (status < 0) {

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

	}



	ret = ocfs2_journal_access(handle, inode, bh,

	ret = ocfs2_journal_access_di(handle, inode, bh,

				      OCFS2_JOURNAL_ACCESS_WRITE);

	if (ret < 0) {

		mlog_errno(ret);