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

Commit 03e4970c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2 

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2: (39 commits)
  Treat writes as new when holes span across page boundaries
  fs,ocfs2: Move o2net_get_func_run_time under CONFIG_OCFS2_FS_STATS.
  ocfs2/dlm: Move kmalloc() outside the spinlock
  ocfs2: Make the left masklogs compat.
  ocfs2: Remove masklog ML_AIO.
  ocfs2: Remove masklog ML_UPTODATE.
  ocfs2: Remove masklog ML_BH_IO.
  ocfs2: Remove masklog ML_JOURNAL.
  ocfs2: Remove masklog ML_EXPORT.
  ocfs2: Remove masklog ML_DCACHE.
  ocfs2: Remove masklog ML_NAMEI.
  ocfs2: Remove mlog(0) from fs/ocfs2/dir.c
  ocfs2: remove NAMEI from symlink.c
  ocfs2: Remove masklog ML_QUOTA.
  ocfs2: Remove mlog(0) from quota_local.c.
  ocfs2: Remove masklog ML_RESERVATIONS.
  ocfs2: Remove masklog ML_XATTR.
  ocfs2: Remove masklog ML_SUPER.
  ocfs2: Remove mlog(0) from fs/ocfs2/heartbeat.c
  ocfs2: Remove mlog(0) from fs/ocfs2/slot_map.c
  ...

Fix up trivial conflict in fs/ocfs2/super.c
parents 1788c208 272b62c1

fs/ocfs2/acl.c

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
#include <linux/slab.h>

#include <linux/string.h>



#define MLOG_MASK_PREFIX ML_INODE

#include <cluster/masklog.h>



#include "ocfs2.h"

fs/ocfs2/alloc.c

+92 −122
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 
#include <linux/swap.h>

#include <linux/quotaops.h>



#define MLOG_MASK_PREFIX ML_DISK_ALLOC

#include <cluster/masklog.h>



#include "ocfs2.h"
@@ -50,6 +49,7 @@ 
#include "uptodate.h"

#include "xattr.h"

#include "refcounttree.h"

#include "ocfs2_trace.h"



#include "buffer_head_io.h"
@@ -886,8 +886,7 @@ static int ocfs2_validate_extent_block(struct super_block *sb, 
	struct ocfs2_extent_block *eb =

		(struct ocfs2_extent_block *)bh->b_data;



	mlog(0, "Validating extent block %llu\n",

	     (unsigned long long)bh->b_blocknr);

	trace_ocfs2_validate_extent_block((unsigned long long)bh->b_blocknr);



	BUG_ON(!buffer_uptodate(bh));
@@ -965,8 +964,6 @@ int ocfs2_num_free_extents(struct ocfs2_super *osb, 
	struct buffer_head *eb_bh = NULL;

	u64 last_eb_blk = 0;



	mlog_entry_void();



	el = et->et_root_el;

	last_eb_blk = ocfs2_et_get_last_eb_blk(et);
@@ -987,7 +984,7 @@ int ocfs2_num_free_extents(struct ocfs2_super *osb, 
bail:

	brelse(eb_bh);



	mlog_exit(retval);

	trace_ocfs2_num_free_extents(retval);

	return retval;

}
@@ -1010,8 +1007,6 @@ static int ocfs2_create_new_meta_bhs(handle_t *handle, 
		OCFS2_SB(ocfs2_metadata_cache_get_super(et->et_ci));

	struct ocfs2_extent_block *eb;



	mlog_entry_void();



	count = 0;

	while (count < wanted) {

		status = ocfs2_claim_metadata(handle,
@@ -1074,8 +1069,8 @@ bail: 
			brelse(bhs[i]);

			bhs[i] = NULL;

		}

		mlog_errno(status);

	}

	mlog_exit(status);

	return status;

}
@@ -1173,8 +1168,6 @@ static int ocfs2_add_branch(handle_t *handle, 
	struct ocfs2_extent_list  *el;

	u32 new_cpos, root_end;



	mlog_entry_void();



	BUG_ON(!last_eb_bh || !*last_eb_bh);



	if (eb_bh) {
@@ -1200,8 +1193,11 @@ static int ocfs2_add_branch(handle_t *handle, 
	 * from new_cpos).

	 */

	if (root_end > new_cpos) {

		mlog(0, "adjust the cluster end from %u to %u\n",

		trace_ocfs2_adjust_rightmost_branch(

			(unsigned long long)

			ocfs2_metadata_cache_owner(et->et_ci),

			root_end, new_cpos);



		status = ocfs2_adjust_rightmost_branch(handle, et);

		if (status) {

			mlog_errno(status);
@@ -1332,7 +1328,6 @@ bail: 
		kfree(new_eb_bhs);

	}



	mlog_exit(status);

	return status;

}
@@ -1353,8 +1348,6 @@ static int ocfs2_shift_tree_depth(handle_t *handle, 
	struct ocfs2_extent_list  *root_el;

	struct ocfs2_extent_list  *eb_el;



	mlog_entry_void();



	status = ocfs2_create_new_meta_bhs(handle, et, 1, meta_ac,

					   &new_eb_bh);

	if (status < 0) {
@@ -1415,7 +1408,6 @@ static int ocfs2_shift_tree_depth(handle_t *handle, 
bail:

	brelse(new_eb_bh);



	mlog_exit(status);

	return status;

}
@@ -1446,8 +1438,6 @@ static int ocfs2_find_branch_target(struct ocfs2_extent_tree *et, 
	struct buffer_head *bh = NULL;

	struct buffer_head *lowest_bh = NULL;



	mlog_entry_void();



	*target_bh = NULL;



	el = et->et_root_el;
@@ -1503,7 +1493,6 @@ static int ocfs2_find_branch_target(struct ocfs2_extent_tree *et, 
bail:

	brelse(bh);



	mlog_exit(status);

	return status;

}
@@ -1540,7 +1529,10 @@ static int ocfs2_grow_tree(handle_t *handle, struct ocfs2_extent_tree *et, 
	 * another tree level */

	if (shift) {

		BUG_ON(bh);

		mlog(0, "need to shift tree depth (current = %d)\n", depth);

		trace_ocfs2_grow_tree(

			(unsigned long long)

			ocfs2_metadata_cache_owner(et->et_ci),

			depth);



		/* ocfs2_shift_tree_depth will return us a buffer with

		 * the new extent block (so we can pass that to
@@ -1570,7 +1562,6 @@ static int ocfs2_grow_tree(handle_t *handle, struct ocfs2_extent_tree *et, 


	/* call ocfs2_add_branch to add the final part of the tree with

	 * the new data. */

	mlog(0, "add branch. bh = %p\n", bh);

	ret = ocfs2_add_branch(handle, et, bh, last_eb_bh,

			       meta_ac);

	if (ret < 0) {
@@ -1645,8 +1636,9 @@ static void ocfs2_rotate_leaf(struct ocfs2_extent_list *el, 
	}

	insert_index = i;



	mlog(0, "ins %u: index %d, has_empty %d, next_free %d, count %d\n",

	     insert_cpos, insert_index, has_empty, next_free, le16_to_cpu(el->l_count));

	trace_ocfs2_rotate_leaf(insert_cpos, insert_index,

				has_empty, next_free,

				le16_to_cpu(el->l_count));



	BUG_ON(insert_index < 0);

	BUG_ON(insert_index >= le16_to_cpu(el->l_count));
@@ -2059,7 +2051,7 @@ static void ocfs2_complete_edge_insert(handle_t *handle, 
	left_el = path_leaf_el(left_path);

	right_el = path_leaf_el(right_path);

	for(i = left_path->p_tree_depth - 1; i > subtree_index; i--) {

		mlog(0, "Adjust records at index %u\n", i);

		trace_ocfs2_complete_edge_insert(i);



		/*

		 * One nice property of knowing that all of these
@@ -2389,7 +2381,9 @@ static int ocfs2_rotate_tree_right(handle_t *handle, 
		goto out;

	}



	mlog(0, "Insert: %u, first left path cpos: %u\n", insert_cpos, cpos);

	trace_ocfs2_rotate_tree_right(

		(unsigned long long)ocfs2_metadata_cache_owner(et->et_ci),

		insert_cpos, cpos);



	/*

	 * What we want to do here is:
@@ -2418,7 +2412,9 @@ static int ocfs2_rotate_tree_right(handle_t *handle, 
	 * rotating subtrees.

	 */

	while (cpos && insert_cpos <= cpos) {

		mlog(0, "Rotating a tree: ins. cpos: %u, left path cpos: %u\n",

		trace_ocfs2_rotate_tree_right(

			(unsigned long long)

			ocfs2_metadata_cache_owner(et->et_ci),

			insert_cpos, cpos);



		ret = ocfs2_find_path(et->et_ci, left_path, cpos);
@@ -2461,9 +2457,9 @@ static int ocfs2_rotate_tree_right(handle_t *handle, 


		start = ocfs2_find_subtree_root(et, left_path, right_path);



		mlog(0, "Subtree root at index %d (blk %llu, depth %d)\n",

		     start,

		     (unsigned long long) right_path->p_node[start].bh->b_blocknr,

		trace_ocfs2_rotate_subtree(start,

			(unsigned long long)

			right_path->p_node[start].bh->b_blocknr,

			right_path->p_tree_depth);



		ret = ocfs2_extend_rotate_transaction(handle, start,
@@ -2964,8 +2960,7 @@ static int __ocfs2_rotate_tree_left(handle_t *handle, 
		subtree_root = ocfs2_find_subtree_root(et, left_path,

						       right_path);



		mlog(0, "Subtree root at index %d (blk %llu, depth %d)\n",

		     subtree_root,

		trace_ocfs2_rotate_subtree(subtree_root,

		     (unsigned long long)

		     right_path->p_node[subtree_root].bh->b_blocknr,

		     right_path->p_tree_depth);
@@ -3989,8 +3984,10 @@ static int ocfs2_append_rec_to_path(handle_t *handle, 
			goto out;

		}



		mlog(0, "Append may need a left path update. cpos: %u, "

		     "left_cpos: %u\n", le32_to_cpu(insert_rec->e_cpos),

		trace_ocfs2_append_rec_to_path(

			(unsigned long long)

			ocfs2_metadata_cache_owner(et->et_ci),

			le32_to_cpu(insert_rec->e_cpos),

			left_cpos);



		/*
@@ -4562,7 +4559,7 @@ static int ocfs2_figure_insert_type(struct ocfs2_extent_tree *et, 
					      ocfs2_et_get_last_eb_blk(et),

					      &bh);

		if (ret) {

			mlog_exit(ret);

			mlog_errno(ret);

			goto out;

		}

		eb = (struct ocfs2_extent_block *) bh->b_data;
@@ -4678,9 +4675,9 @@ int ocfs2_insert_extent(handle_t *handle, 
	struct ocfs2_insert_type insert = {0, };

	struct ocfs2_extent_rec rec;



	mlog(0, "add %u clusters at position %u to owner %llu\n",

	     new_clusters, cpos,

	     (unsigned long long)ocfs2_metadata_cache_owner(et->et_ci));

	trace_ocfs2_insert_extent_start(

		(unsigned long long)ocfs2_metadata_cache_owner(et->et_ci),

		cpos, new_clusters);



	memset(&rec, 0, sizeof(rec));

	rec.e_cpos = cpu_to_le32(cpos);
@@ -4700,11 +4697,9 @@ int ocfs2_insert_extent(handle_t *handle, 
		goto bail;

	}



	mlog(0, "Insert.appending: %u, Insert.Contig: %u, "

	     "Insert.contig_index: %d, Insert.free_records: %d, "

	     "Insert.tree_depth: %d\n",

	     insert.ins_appending, insert.ins_contig, insert.ins_contig_index,

	     free_records, insert.ins_tree_depth);

	trace_ocfs2_insert_extent(insert.ins_appending, insert.ins_contig,

				  insert.ins_contig_index, free_records,

				  insert.ins_tree_depth);



	if (insert.ins_contig == CONTIG_NONE && free_records == 0) {

		status = ocfs2_grow_tree(handle, et,
@@ -4726,7 +4721,6 @@ int ocfs2_insert_extent(handle_t *handle, 
bail:

	brelse(last_eb_bh);



	mlog_exit(status);

	return status;

}
@@ -4746,7 +4740,7 @@ int ocfs2_add_clusters_in_btree(handle_t *handle, 
				struct ocfs2_alloc_context *meta_ac,

				enum ocfs2_alloc_restarted *reason_ret)

{

	int status = 0;

	int status = 0, err = 0;

	int free_extents;

	enum ocfs2_alloc_restarted reason = RESTART_NONE;

	u32 bit_off, num_bits;
@@ -4773,14 +4767,14 @@ int ocfs2_add_clusters_in_btree(handle_t *handle, 
	 * 2) we are so fragmented, we've needed to add metadata too

	 *    many times. */

	if (!free_extents && !meta_ac) {

		mlog(0, "we haven't reserved any metadata!\n");

		err = -1;

		status = -EAGAIN;

		reason = RESTART_META;

		goto leave;

	} else if ((!free_extents)

		   && (ocfs2_alloc_context_bits_left(meta_ac)

		       < ocfs2_extend_meta_needed(et->et_root_el))) {

		mlog(0, "filesystem is really fragmented...\n");

		err = -2;

		status = -EAGAIN;

		reason = RESTART_META;

		goto leave;
@@ -4805,9 +4799,9 @@ int ocfs2_add_clusters_in_btree(handle_t *handle, 
	}



	block = ocfs2_clusters_to_blocks(osb->sb, bit_off);

	mlog(0, "Allocating %u clusters at block %u for owner %llu\n",

	     num_bits, bit_off,

	     (unsigned long long)ocfs2_metadata_cache_owner(et->et_ci));

	trace_ocfs2_add_clusters_in_btree(

	     (unsigned long long)ocfs2_metadata_cache_owner(et->et_ci),

	     bit_off, num_bits);

	status = ocfs2_insert_extent(handle, et, *logical_offset, block,

				     num_bits, flags, meta_ac);

	if (status < 0) {
@@ -4821,16 +4815,15 @@ int ocfs2_add_clusters_in_btree(handle_t *handle, 
	*logical_offset += num_bits;



	if (clusters_to_add) {

		mlog(0, "need to alloc once more, wanted = %u\n",

		     clusters_to_add);

		err = clusters_to_add;

		status = -EAGAIN;

		reason = RESTART_TRANS;

	}



leave:

	mlog_exit(status);

	if (reason_ret)

		*reason_ret = reason;

	trace_ocfs2_add_clusters_in_btree_ret(status, reason, err);

	return status;

}
@@ -5039,7 +5032,7 @@ int ocfs2_split_extent(handle_t *handle, 
					      ocfs2_et_get_last_eb_blk(et),

					      &last_eb_bh);

		if (ret) {

			mlog_exit(ret);

			mlog_errno(ret);

			goto out;

		}
@@ -5056,8 +5049,8 @@ int ocfs2_split_extent(handle_t *handle, 


	ctxt.c_has_empty_extent = ocfs2_is_empty_extent(&el->l_recs[0]);



	mlog(0, "index: %d, contig: %u, has_empty: %u, split_covers: %u\n",

	     split_index, ctxt.c_contig_type, ctxt.c_has_empty_extent,

	trace_ocfs2_split_extent(split_index, ctxt.c_contig_type,

				 ctxt.c_has_empty_extent,

				 ctxt.c_split_covers_rec);



	if (ctxt.c_contig_type == CONTIG_NONE) {
@@ -5192,8 +5185,9 @@ int ocfs2_mark_extent_written(struct inode *inode, 
{

	int ret;



	mlog(0, "Inode %lu cpos %u, len %u, phys clusters %u\n",

	     inode->i_ino, cpos, len, phys);

	trace_ocfs2_mark_extent_written(

		(unsigned long long)OCFS2_I(inode)->ip_blkno,

		cpos, len, phys);



	if (!ocfs2_writes_unwritten_extents(OCFS2_SB(inode->i_sb))) {

		ocfs2_error(inode->i_sb, "Inode %llu has unwritten extents "
@@ -5512,11 +5506,10 @@ int ocfs2_remove_extent(handle_t *handle, 


	BUG_ON(cpos < le32_to_cpu(rec->e_cpos) || trunc_range > rec_range);



	mlog(0, "Owner %llu, remove (cpos %u, len %u). Existing index %d "

	     "(cpos %u, len %u)\n",

	trace_ocfs2_remove_extent(

		(unsigned long long)ocfs2_metadata_cache_owner(et->et_ci),

	     cpos, len, index,

	     le32_to_cpu(rec->e_cpos), ocfs2_rec_clusters(el, rec));

		cpos, len, index, le32_to_cpu(rec->e_cpos),

		ocfs2_rec_clusters(el, rec));



	if (le32_to_cpu(rec->e_cpos) == cpos || rec_range == trunc_range) {

		ret = ocfs2_truncate_rec(handle, et, path, index, dealloc,
@@ -5795,9 +5788,6 @@ int ocfs2_truncate_log_append(struct ocfs2_super *osb, 
	struct ocfs2_dinode *di;

	struct ocfs2_truncate_log *tl;



	mlog_entry("start_blk = %llu, num_clusters = %u\n",

		   (unsigned long long)start_blk, num_clusters);



	BUG_ON(mutex_trylock(&tl_inode->i_mutex));



	start_cluster = ocfs2_blocks_to_clusters(osb->sb, start_blk);
@@ -5834,10 +5824,9 @@ int ocfs2_truncate_log_append(struct ocfs2_super *osb, 
		goto bail;

	}



	mlog(0, "Log truncate of %u clusters starting at cluster %u to "

	     "%llu (index = %d)\n", num_clusters, start_cluster,

	     (unsigned long long)OCFS2_I(tl_inode)->ip_blkno, index);



	trace_ocfs2_truncate_log_append(

		(unsigned long long)OCFS2_I(tl_inode)->ip_blkno, index,

		start_cluster, num_clusters);

	if (ocfs2_truncate_log_can_coalesce(tl, start_cluster)) {

		/*

		 * Move index back to the record we are coalescing with.
@@ -5846,7 +5835,8 @@ int ocfs2_truncate_log_append(struct ocfs2_super *osb, 
		index--;



		num_clusters += le32_to_cpu(tl->tl_recs[index].t_clusters);

		mlog(0, "Coalesce with index %u (start = %u, clusters = %u)\n",

		trace_ocfs2_truncate_log_append(

			(unsigned long long)OCFS2_I(tl_inode)->ip_blkno,

			index, le32_to_cpu(tl->tl_recs[index].t_start),

			num_clusters);

	} else {
@@ -5859,7 +5849,6 @@ int ocfs2_truncate_log_append(struct ocfs2_super *osb, 


	osb->truncated_clusters += num_clusters;

bail:

	mlog_exit(status);

	return status;

}
@@ -5878,8 +5867,6 @@ static int ocfs2_replay_truncate_records(struct ocfs2_super *osb, 
	struct inode *tl_inode = osb->osb_tl_inode;

	struct buffer_head *tl_bh = osb->osb_tl_bh;



	mlog_entry_void();



	di = (struct ocfs2_dinode *) tl_bh->b_data;

	tl = &di->id2.i_dealloc;

	i = le16_to_cpu(tl->tl_used) - 1;
@@ -5915,7 +5902,8 @@ static int ocfs2_replay_truncate_records(struct ocfs2_super *osb, 
		/* if start_blk is not set, we ignore the record as

		 * invalid. */

		if (start_blk) {

			mlog(0, "free record %d, start = %u, clusters = %u\n",

			trace_ocfs2_replay_truncate_records(

				(unsigned long long)OCFS2_I(tl_inode)->ip_blkno,

				i, le32_to_cpu(rec.t_start), num_clusters);



			status = ocfs2_free_clusters(handle, data_alloc_inode,
@@ -5932,7 +5920,6 @@ static int ocfs2_replay_truncate_records(struct ocfs2_super *osb, 
	osb->truncated_clusters = 0;



bail:

	mlog_exit(status);

	return status;

}
@@ -5949,8 +5936,6 @@ int __ocfs2_flush_truncate_log(struct ocfs2_super *osb) 
	struct ocfs2_dinode *di;

	struct ocfs2_truncate_log *tl;



	mlog_entry_void();



	BUG_ON(mutex_trylock(&tl_inode->i_mutex));



	di = (struct ocfs2_dinode *) tl_bh->b_data;
@@ -5962,8 +5947,9 @@ int __ocfs2_flush_truncate_log(struct ocfs2_super *osb) 


	tl = &di->id2.i_dealloc;

	num_to_flush = le16_to_cpu(tl->tl_used);

	mlog(0, "Flush %u records from truncate log #%llu\n",

	     num_to_flush, (unsigned long long)OCFS2_I(tl_inode)->ip_blkno);

	trace_ocfs2_flush_truncate_log(

		(unsigned long long)OCFS2_I(tl_inode)->ip_blkno,

		num_to_flush);

	if (!num_to_flush) {

		status = 0;

		goto out;
@@ -6009,7 +5995,6 @@ out_mutex: 
	iput(data_alloc_inode);



out:

	mlog_exit(status);

	return status;

}
@@ -6032,15 +6017,11 @@ static void ocfs2_truncate_log_worker(struct work_struct *work) 
		container_of(work, struct ocfs2_super,

			     osb_truncate_log_wq.work);



	mlog_entry_void();



	status = ocfs2_flush_truncate_log(osb);

	if (status < 0)

		mlog_errno(status);

	else

		ocfs2_init_steal_slots(osb);



	mlog_exit(status);

}



#define OCFS2_TRUNCATE_LOG_FLUSH_INTERVAL (2 * HZ)
@@ -6086,7 +6067,6 @@ static int ocfs2_get_truncate_log_info(struct ocfs2_super *osb, 
	*tl_inode = inode;

	*tl_bh    = bh;

bail:

	mlog_exit(status);

	return status;

}
@@ -6106,7 +6086,7 @@ int ocfs2_begin_truncate_log_recovery(struct ocfs2_super *osb, 


	*tl_copy = NULL;



	mlog(0, "recover truncate log from slot %d\n", slot_num);

	trace_ocfs2_begin_truncate_log_recovery(slot_num);



	status = ocfs2_get_truncate_log_info(osb, slot_num, &tl_inode, &tl_bh);

	if (status < 0) {
@@ -6123,8 +6103,7 @@ int ocfs2_begin_truncate_log_recovery(struct ocfs2_super *osb, 


	tl = &di->id2.i_dealloc;

	if (le16_to_cpu(tl->tl_used)) {

		mlog(0, "We'll have %u logs to recover\n",

		     le16_to_cpu(tl->tl_used));

		trace_ocfs2_truncate_log_recovery_num(le16_to_cpu(tl->tl_used));



		*tl_copy = kmalloc(tl_bh->b_size, GFP_KERNEL);

		if (!(*tl_copy)) {
@@ -6157,9 +6136,9 @@ bail: 
	if (status < 0 && (*tl_copy)) {

		kfree(*tl_copy);

		*tl_copy = NULL;

		mlog_errno(status);

	}



	mlog_exit(status);

	return status;

}
@@ -6174,8 +6153,6 @@ int ocfs2_complete_truncate_log_recovery(struct ocfs2_super *osb, 
	struct inode *tl_inode = osb->osb_tl_inode;

	struct ocfs2_truncate_log *tl;



	mlog_entry_void();



	if (OCFS2_I(tl_inode)->ip_blkno == le64_to_cpu(tl_copy->i_blkno)) {

		mlog(ML_ERROR, "Asked to recover my own truncate log!\n");

		return -EINVAL;
@@ -6183,8 +6160,9 @@ int ocfs2_complete_truncate_log_recovery(struct ocfs2_super *osb, 


	tl = &tl_copy->id2.i_dealloc;

	num_recs = le16_to_cpu(tl->tl_used);

	mlog(0, "cleanup %u records from %llu\n", num_recs,

	     (unsigned long long)le64_to_cpu(tl_copy->i_blkno));

	trace_ocfs2_complete_truncate_log_recovery(

		(unsigned long long)le64_to_cpu(tl_copy->i_blkno),

		num_recs);



	mutex_lock(&tl_inode->i_mutex);

	for(i = 0; i < num_recs; i++) {
@@ -6219,7 +6197,6 @@ int ocfs2_complete_truncate_log_recovery(struct ocfs2_super *osb, 
bail_up:

	mutex_unlock(&tl_inode->i_mutex);



	mlog_exit(status);

	return status;

}
@@ -6228,8 +6205,6 @@ void ocfs2_truncate_log_shutdown(struct ocfs2_super *osb) 
	int status;

	struct inode *tl_inode = osb->osb_tl_inode;



	mlog_entry_void();



	if (tl_inode) {

		cancel_delayed_work(&osb->osb_truncate_log_wq);

		flush_workqueue(ocfs2_wq);
@@ -6241,8 +6216,6 @@ void ocfs2_truncate_log_shutdown(struct ocfs2_super *osb) 
		brelse(osb->osb_tl_bh);

		iput(osb->osb_tl_inode);

	}



	mlog_exit_void();

}



int ocfs2_truncate_log_init(struct ocfs2_super *osb)
@@ -6251,8 +6224,6 @@ int ocfs2_truncate_log_init(struct ocfs2_super *osb) 
	struct inode *tl_inode = NULL;

	struct buffer_head *tl_bh = NULL;



	mlog_entry_void();



	status = ocfs2_get_truncate_log_info(osb,

					     osb->slot_num,

					     &tl_inode,
@@ -6268,7 +6239,6 @@ int ocfs2_truncate_log_init(struct ocfs2_super *osb) 
	osb->osb_tl_bh    = tl_bh;

	osb->osb_tl_inode = tl_inode;



	mlog_exit(status);

	return status;

}
@@ -6350,8 +6320,8 @@ static int ocfs2_free_cached_blocks(struct ocfs2_super *osb, 
		else

			bg_blkno = ocfs2_which_suballoc_group(head->free_blk,

							      head->free_bit);

		mlog(0, "Free bit: (bit %u, blkno %llu)\n",

		     head->free_bit, (unsigned long long)head->free_blk);

		trace_ocfs2_free_cached_blocks(

		     (unsigned long long)head->free_blk, head->free_bit);



		ret = ocfs2_free_suballoc_bits(handle, inode, di_bh,

					       head->free_bit, bg_blkno, 1);
@@ -6404,8 +6374,7 @@ int ocfs2_cache_cluster_dealloc(struct ocfs2_cached_dealloc_ctxt *ctxt, 
		return ret;

	}



	mlog(0, "Insert clusters: (bit %u, blk %llu)\n",

	     bit, (unsigned long long)blkno);

	trace_ocfs2_cache_cluster_dealloc((unsigned long long)blkno, bit);



	item->free_blk = blkno;

	item->free_bit = bit;
@@ -6480,8 +6449,8 @@ int ocfs2_run_deallocs(struct ocfs2_super *osb, 
		fl = ctxt->c_first_suballocator;



		if (fl->f_first) {

			mlog(0, "Free items: (type %u, slot %d)\n",

			     fl->f_inode_type, fl->f_slot);

			trace_ocfs2_run_deallocs(fl->f_inode_type,

						 fl->f_slot);

			ret2 = ocfs2_free_cached_blocks(osb,

							fl->f_inode_type,

							fl->f_slot,
@@ -6558,8 +6527,9 @@ int ocfs2_cache_block_dealloc(struct ocfs2_cached_dealloc_ctxt *ctxt, 
		goto out;

	}



	mlog(0, "Insert: (type %d, slot %u, bit %u, blk %llu)\n",

	     type, slot, bit, (unsigned long long)blkno);

	trace_ocfs2_cache_block_dealloc(type, slot,

					(unsigned long long)suballoc,

					(unsigned long long)blkno, bit);



	item->free_bg = suballoc;

	item->free_blk = blkno;
@@ -7005,8 +6975,6 @@ int ocfs2_commit_truncate(struct ocfs2_super *osb, 
	struct ocfs2_extent_tree et;

	struct ocfs2_cached_dealloc_ctxt dealloc;



	mlog_entry_void();



	ocfs2_init_dinode_extent_tree(&et, INODE_CACHE(inode), di_bh);

	ocfs2_init_dealloc_ctxt(&dealloc);
@@ -7041,8 +7009,11 @@ start: 
		goto bail;

	}



	mlog(0, "inode->ip_clusters = %u, tree_depth = %u\n",

	     OCFS2_I(inode)->ip_clusters, path->p_tree_depth);

	trace_ocfs2_commit_truncate(

		(unsigned long long)OCFS2_I(inode)->ip_blkno,

		new_highest_cpos,

		OCFS2_I(inode)->ip_clusters,

		path->p_tree_depth);



	/*

	 * By now, el will point to the extent list on the bottom most
@@ -7136,7 +7107,6 @@ bail: 


	ocfs2_free_path(path);



	mlog_exit(status);

	return status;

}

fs/ocfs2/aops.c

+39 −43
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
#include <linux/mpage.h>

#include <linux/quotaops.h>



#define MLOG_MASK_PREFIX ML_FILE_IO

#include <cluster/masklog.h>



#include "ocfs2.h"
@@ -45,6 +44,7 @@ 
#include "super.h"

#include "symlink.h"

#include "refcounttree.h"

#include "ocfs2_trace.h"



#include "buffer_head_io.h"
@@ -59,7 +59,8 @@ static int ocfs2_symlink_get_block(struct inode *inode, sector_t iblock, 
	struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);

	void *kaddr;



	mlog_entry("(0x%p, %llu, 0x%p, %d)\n", inode,

	trace_ocfs2_symlink_get_block(

			(unsigned long long)OCFS2_I(inode)->ip_blkno,

			(unsigned long long)iblock, bh_result, create);



	BUG_ON(ocfs2_inode_is_fast_symlink(inode));
@@ -123,7 +124,6 @@ static int ocfs2_symlink_get_block(struct inode *inode, sector_t iblock, 
bail:

	brelse(bh);



	mlog_exit(err);

	return err;

}
@@ -136,7 +136,7 @@ int ocfs2_get_block(struct inode *inode, sector_t iblock, 
	u64 p_blkno, count, past_eof;

	struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);



	mlog_entry("(0x%p, %llu, 0x%p, %d)\n", inode,

	trace_ocfs2_get_block((unsigned long long)OCFS2_I(inode)->ip_blkno,

			      (unsigned long long)iblock, bh_result, create);



	if (OCFS2_I(inode)->ip_flags & OCFS2_INODE_SYSTEM_FILE)
@@ -199,7 +199,8 @@ int ocfs2_get_block(struct inode *inode, sector_t iblock, 
	}



	past_eof = ocfs2_blocks_for_bytes(inode->i_sb, i_size_read(inode));

	mlog(0, "Inode %lu, past_eof = %llu\n", inode->i_ino,



	trace_ocfs2_get_block_end((unsigned long long)OCFS2_I(inode)->ip_blkno,

				  (unsigned long long)past_eof);

	if (create && (iblock >= past_eof))

		set_buffer_new(bh_result);
@@ -208,7 +209,6 @@ bail: 
	if (err < 0)

		err = -EIO;



	mlog_exit(err);

	return err;

}
@@ -278,7 +278,8 @@ static int ocfs2_readpage(struct file *file, struct page *page) 
	loff_t start = (loff_t)page->index << PAGE_CACHE_SHIFT;

	int ret, unlock = 1;



	mlog_entry("(0x%p, %lu)\n", file, (page ? page->index : 0));

	trace_ocfs2_readpage((unsigned long long)oi->ip_blkno,

			     (page ? page->index : 0));



	ret = ocfs2_inode_lock_with_page(inode, NULL, 0, page);

	if (ret != 0) {
@@ -323,7 +324,6 @@ out_inode_unlock: 
out:

	if (unlock)

		unlock_page(page);

	mlog_exit(ret);

	return ret;

}
@@ -396,15 +396,11 @@ out_unlock: 
 */

static int ocfs2_writepage(struct page *page, struct writeback_control *wbc)

{

	int ret;



	mlog_entry("(0x%p)\n", page);



	ret = block_write_full_page(page, ocfs2_get_block, wbc);



	mlog_exit(ret);

	trace_ocfs2_writepage(

		(unsigned long long)OCFS2_I(page->mapping->host)->ip_blkno,

		page->index);



	return ret;

	return block_write_full_page(page, ocfs2_get_block, wbc);

}



/* Taken from ext3. We don't necessarily need the full blown
@@ -450,7 +446,8 @@ static sector_t ocfs2_bmap(struct address_space *mapping, sector_t block) 
	int err = 0;

	struct inode *inode = mapping->host;



	mlog_entry("(block = %llu)\n", (unsigned long long)block);

	trace_ocfs2_bmap((unsigned long long)OCFS2_I(inode)->ip_blkno,

			 (unsigned long long)block);



	/* We don't need to lock journal system files, since they aren't

	 * accessed concurrently from multiple nodes.
@@ -484,8 +481,6 @@ static sector_t ocfs2_bmap(struct address_space *mapping, sector_t block) 
bail:

	status = err ? 0 : p_blkno;



	mlog_exit((int)status);



	return status;

}
@@ -616,9 +611,6 @@ static ssize_t ocfs2_direct_IO(int rw, 
{

	struct file *file = iocb->ki_filp;

	struct inode *inode = file->f_path.dentry->d_inode->i_mapping->host;

	int ret;



	mlog_entry_void();



	/*

	 * Fallback to buffered I/O if we see an inode without
@@ -631,13 +623,10 @@ static ssize_t ocfs2_direct_IO(int rw, 
	if (i_size_read(inode) <= offset)

		return 0;



	ret = __blockdev_direct_IO(rw, iocb, inode, inode->i_sb->s_bdev,

	return __blockdev_direct_IO(rw, iocb, inode, inode->i_sb->s_bdev,

				    iov, offset, nr_segs,

				    ocfs2_direct_IO_get_blocks,

				    ocfs2_dio_end_io, NULL, 0);



	mlog_exit(ret);

	return ret;

}



static void ocfs2_figure_cluster_boundaries(struct ocfs2_super *osb,
@@ -1026,6 +1015,12 @@ static int ocfs2_prepare_page_for_write(struct inode *inode, u64 *p_blkno, 
	ocfs2_figure_cluster_boundaries(OCFS2_SB(inode->i_sb), cpos,

					&cluster_start, &cluster_end);



	/* treat the write as new if the a hole/lseek spanned across

	 * the page boundary.

	 */

	new = new | ((i_size_read(inode) <= page_offset(page)) &&

			(page_offset(page) <= user_pos));



	if (page == wc->w_target_page) {

		map_from = user_pos & (PAGE_CACHE_SIZE - 1);

		map_to = map_from + user_len;
@@ -1534,8 +1529,8 @@ static int ocfs2_try_to_write_inline_data(struct address_space *mapping, 
	struct ocfs2_inode_info *oi = OCFS2_I(inode);

	struct ocfs2_dinode *di = NULL;



	mlog(0, "Inode %llu, write of %u bytes at off %llu. features: 0x%x\n",

	     (unsigned long long)oi->ip_blkno, len, (unsigned long long)pos,

	trace_ocfs2_try_to_write_inline_data((unsigned long long)oi->ip_blkno,

					     len, (unsigned long long)pos,

					     oi->ip_dyn_features);



	/*
@@ -1739,6 +1734,13 @@ try_again: 


	di = (struct ocfs2_dinode *)wc->w_di_bh->b_data;



	trace_ocfs2_write_begin_nolock(

			(unsigned long long)OCFS2_I(inode)->ip_blkno,

			(long long)i_size_read(inode),

			le32_to_cpu(di->i_clusters),

			pos, len, flags, mmap_page,

			clusters_to_alloc, extents_to_split);



	/*

	 * We set w_target_from, w_target_to here so that

	 * ocfs2_write_end() knows which range in the target page to
@@ -1751,12 +1753,6 @@ try_again: 
		 * ocfs2_lock_allocators(). It greatly over-estimates

		 * the work to be done.

		 */

		mlog(0, "extend inode %llu, i_size = %lld, di->i_clusters = %u,"

		     " clusters_to_add = %u, extents_to_split = %u\n",

		     (unsigned long long)OCFS2_I(inode)->ip_blkno,

		     (long long)i_size_read(inode), le32_to_cpu(di->i_clusters),

		     clusters_to_alloc, extents_to_split);



		ocfs2_init_dinode_extent_tree(&et, INODE_CACHE(inode),

					      wc->w_di_bh);

		ret = ocfs2_lock_allocators(inode, &et,
@@ -1938,8 +1934,8 @@ static void ocfs2_write_end_inline(struct inode *inode, loff_t pos, 
	memcpy(di->id2.i_data.id_data + pos, kaddr + pos, *copied);

	kunmap_atomic(kaddr, KM_USER0);



	mlog(0, "Data written to inode at offset %llu. "

	     "id_count = %u, copied = %u, i_dyn_features = 0x%x\n",

	trace_ocfs2_write_end_inline(

	     (unsigned long long)OCFS2_I(inode)->ip_blkno,

	     (unsigned long long)pos, *copied,

	     le16_to_cpu(di->id2.i_data.id_count),

	     le16_to_cpu(di->i_dyn_features));

fs/ocfs2/buffer_head_io.c

+18 −31
Original line number Diff line number Diff line
@@ -35,8 +35,8 @@ 
#include "inode.h"

#include "journal.h"

#include "uptodate.h"



#include "buffer_head_io.h"

#include "ocfs2_trace.h"



/*

 * Bits on bh->b_state used by ocfs2.
@@ -55,8 +55,7 @@ int ocfs2_write_block(struct ocfs2_super *osb, struct buffer_head *bh, 
{

	int ret = 0;



	mlog_entry("(bh->b_blocknr = %llu, ci=%p)\n",

		   (unsigned long long)bh->b_blocknr, ci);

	trace_ocfs2_write_block((unsigned long long)bh->b_blocknr, ci);



	BUG_ON(bh->b_blocknr < OCFS2_SUPER_BLOCK_BLKNO);

	BUG_ON(buffer_jbd(bh));
@@ -66,6 +65,7 @@ int ocfs2_write_block(struct ocfs2_super *osb, struct buffer_head *bh, 
	 * can get modified during recovery even if read-only. */

	if (ocfs2_is_hard_readonly(osb)) {

		ret = -EROFS;

		mlog_errno(ret);

		goto out;

	}
@@ -91,11 +91,11 @@ int ocfs2_write_block(struct ocfs2_super *osb, struct buffer_head *bh, 
		 * uptodate. */

		ret = -EIO;

		put_bh(bh);

		mlog_errno(ret);

	}



	ocfs2_metadata_cache_io_unlock(ci);

out:

	mlog_exit(ret);

	return ret;

}
@@ -106,10 +106,10 @@ int ocfs2_read_blocks_sync(struct ocfs2_super *osb, u64 block, 
	unsigned int i;

	struct buffer_head *bh;



	if (!nr) {

		mlog(ML_BH_IO, "No buffers will be read!\n");

	trace_ocfs2_read_blocks_sync((unsigned long long)block, nr);



	if (!nr)

		goto bail;

	}



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

		if (bhs[i] == NULL) {
@@ -123,9 +123,7 @@ int ocfs2_read_blocks_sync(struct ocfs2_super *osb, u64 block, 
		bh = bhs[i];



		if (buffer_jbd(bh)) {

			mlog(ML_BH_IO,

			     "trying to sync read a jbd "

			     "managed bh (blocknr = %llu), skipping\n",

			trace_ocfs2_read_blocks_sync_jbd(

					(unsigned long long)bh->b_blocknr);

			continue;

		}
@@ -186,8 +184,7 @@ int ocfs2_read_blocks(struct ocfs2_caching_info *ci, u64 block, int nr, 
	struct buffer_head *bh;

	struct super_block *sb = ocfs2_metadata_cache_get_super(ci);



	mlog_entry("(ci=%p, block=(%llu), nr=(%d), flags=%d)\n",

		   ci, (unsigned long long)block, nr, flags);

	trace_ocfs2_read_blocks_begin(ci, (unsigned long long)block, nr, flags);



	BUG_ON(!ci);

	BUG_ON((flags & OCFS2_BH_READAHEAD) &&
@@ -207,7 +204,6 @@ int ocfs2_read_blocks(struct ocfs2_caching_info *ci, u64 block, int nr, 
	}



	if (nr == 0) {

		mlog(ML_BH_IO, "No buffers will be read!\n");

		status = 0;

		goto bail;

	}
@@ -251,8 +247,7 @@ int ocfs2_read_blocks(struct ocfs2_caching_info *ci, u64 block, int nr, 
		 */



		if (!ignore_cache && !ocfs2_buffer_uptodate(ci, bh)) {

			mlog(ML_UPTODATE,

			     "bh (%llu), owner %llu not uptodate\n",

			trace_ocfs2_read_blocks_from_disk(

			     (unsigned long long)bh->b_blocknr,

			     (unsigned long long)ocfs2_metadata_cache_owner(ci));

			/* We're using ignore_cache here to say
@@ -260,11 +255,10 @@ int ocfs2_read_blocks(struct ocfs2_caching_info *ci, u64 block, int nr, 
			ignore_cache = 1;

		}



		trace_ocfs2_read_blocks_bh((unsigned long long)bh->b_blocknr,

			ignore_cache, buffer_jbd(bh), buffer_dirty(bh));



		if (buffer_jbd(bh)) {

			if (ignore_cache)

				mlog(ML_BH_IO, "trying to sync read a jbd "

					       "managed bh (blocknr = %llu)\n",

				     (unsigned long long)bh->b_blocknr);

			continue;

		}
@@ -272,9 +266,6 @@ int ocfs2_read_blocks(struct ocfs2_caching_info *ci, u64 block, int nr, 
			if (buffer_dirty(bh)) {

				/* This should probably be a BUG, or

				 * at least return an error. */

				mlog(ML_BH_IO, "asking me to sync read a dirty "

					       "buffer! (blocknr = %llu)\n",

				     (unsigned long long)bh->b_blocknr);

				continue;

			}
@@ -367,14 +358,11 @@ int ocfs2_read_blocks(struct ocfs2_caching_info *ci, u64 block, int nr, 
	}

	ocfs2_metadata_cache_io_unlock(ci);



	mlog(ML_BH_IO, "block=(%llu), nr=(%d), cached=%s, flags=0x%x\n",

	     (unsigned long long)block, nr,

	     ((flags & OCFS2_BH_IGNORE_CACHE) || ignore_cache) ? "no" : "yes",

	     flags);

	trace_ocfs2_read_blocks_end((unsigned long long)block, nr,

				    flags, ignore_cache);



bail:



	mlog_exit(status);

	return status;

}
@@ -408,13 +396,12 @@ int ocfs2_write_super_or_backup(struct ocfs2_super *osb, 
	int ret = 0;

	struct ocfs2_dinode *di = (struct ocfs2_dinode *)bh->b_data;



	mlog_entry_void();



	BUG_ON(buffer_jbd(bh));

	ocfs2_check_super_or_backup(osb->sb, bh->b_blocknr);



	if (ocfs2_is_hard_readonly(osb) || ocfs2_is_soft_readonly(osb)) {

		ret = -EROFS;

		mlog_errno(ret);

		goto out;

	}
@@ -434,9 +421,9 @@ int ocfs2_write_super_or_backup(struct ocfs2_super *osb, 
	if (!buffer_uptodate(bh)) {

		ret = -EIO;

		put_bh(bh);

		mlog_errno(ret);

	}



out:

	mlog_exit(ret);

	return ret;

}

fs/ocfs2/cluster/heartbeat.c

+0 −3
Original line number Diff line number Diff line
@@ -1654,8 +1654,6 @@ static int o2hb_populate_slot_data(struct o2hb_region *reg) 
	struct o2hb_disk_slot *slot;

	struct o2hb_disk_heartbeat_block *hb_block;



	mlog_entry_void();



	ret = o2hb_read_slots(reg, reg->hr_blocks);

	if (ret) {

		mlog_errno(ret);
@@ -1677,7 +1675,6 @@ static int o2hb_populate_slot_data(struct o2hb_region *reg) 
	}



out:

	mlog_exit(ret);

	return ret;

}