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

Commit aecf5866 authored by Tao Ma's avatar Tao Ma Committed by Joel Becker
Browse files

ocfs2: Remove unused truncate function from alloc.c 



Tristan Ye has done some refactoring against our truncate
process, so some functions like ocfs2_prepare_truncate and
ocfs2_free_truncate_context are no use and we'd better
remove them.

Signed-off-by: default avatarTao Ma <tao.ma@oracle.com>
Signed-off-by: default avatarJoel Becker <joel.becker@oracle.com>
parent cc548166

fs/ocfs2/alloc.c

+0 −74
Original line number Diff line number Diff line
@@ -565,7 +565,6 @@ static inline int ocfs2_et_sanity_check(struct ocfs2_extent_tree *et) 
	return ret;

}



static void ocfs2_free_truncate_context(struct ocfs2_truncate_context *tc);

static int ocfs2_cache_extent_block_free(struct ocfs2_cached_dealloc_ctxt *ctxt,

					 struct ocfs2_extent_block *eb);

static void ocfs2_adjust_rightmost_records(handle_t *handle,
@@ -7141,64 +7140,6 @@ int ocfs2_commit_truncate(struct ocfs2_super *osb, 
	return status;

}



/*

 * Expects the inode to already be locked.

 */

int ocfs2_prepare_truncate(struct ocfs2_super *osb,

			   struct inode *inode,

			   struct buffer_head *fe_bh,

			   struct ocfs2_truncate_context **tc)

{

	int status;

	unsigned int new_i_clusters;

	struct ocfs2_dinode *fe;

	struct ocfs2_extent_block *eb;

	struct buffer_head *last_eb_bh = NULL;



	mlog_entry_void();



	*tc = NULL;



	new_i_clusters = ocfs2_clusters_for_bytes(osb->sb,

						  i_size_read(inode));

	fe = (struct ocfs2_dinode *) fe_bh->b_data;



	mlog(0, "fe->i_clusters = %u, new_i_clusters = %u, fe->i_size ="

	     "%llu\n", le32_to_cpu(fe->i_clusters), new_i_clusters,

	     (unsigned long long)le64_to_cpu(fe->i_size));



	*tc = kzalloc(sizeof(struct ocfs2_truncate_context), GFP_KERNEL);

	if (!(*tc)) {

		status = -ENOMEM;

		mlog_errno(status);

		goto bail;

	}

	ocfs2_init_dealloc_ctxt(&(*tc)->tc_dealloc);



	if (fe->id2.i_list.l_tree_depth) {

		status = ocfs2_read_extent_block(INODE_CACHE(inode),

						 le64_to_cpu(fe->i_last_eb_blk),

						 &last_eb_bh);

		if (status < 0) {

			mlog_errno(status);

			goto bail;

		}

		eb = (struct ocfs2_extent_block *) last_eb_bh->b_data;

	}



	(*tc)->tc_last_eb_bh = last_eb_bh;



	status = 0;

bail:

	if (status < 0) {

		if (*tc)

			ocfs2_free_truncate_context(*tc);

		*tc = NULL;

	}

	mlog_exit_void();

	return status;

}



/*

 * 'start' is inclusive, 'end' is not.

 */
@@ -7273,18 +7214,3 @@ int ocfs2_truncate_inline(struct inode *inode, struct buffer_head *di_bh, 
out:

	return ret;

}
 


static void ocfs2_free_truncate_context(struct ocfs2_truncate_context *tc)

{

	/*

	 * The caller is responsible for completing deallocation

	 * before freeing the context.

	 */

	if (tc->tc_dealloc.c_first_suballocator != NULL)

		mlog(ML_NOTICE,

		     "Truncate completion has non-empty dealloc context\n");



	brelse(tc->tc_last_eb_bh);



	kfree(tc);

}

fs/ocfs2/alloc.h

+0 −4
Original line number Diff line number Diff line
@@ -228,10 +228,6 @@ struct ocfs2_truncate_context { 


int ocfs2_zero_range_for_truncate(struct inode *inode, handle_t *handle,

				  u64 range_start, u64 range_end);

int ocfs2_prepare_truncate(struct ocfs2_super *osb,

			   struct inode *inode,

			   struct buffer_head *fe_bh,

			   struct ocfs2_truncate_context **tc);

int ocfs2_commit_truncate(struct ocfs2_super *osb,

			  struct inode *inode,

			  struct buffer_head *di_bh);