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

Commit 02dc1af4 authored by Mark Fasheh's avatar Mark Fasheh
Browse files

ocfs2: pass ocfs2_super * into ocfs2_commit_trans() 



This sets us up to remove handle->journal.

Signed-off-by: default avatarMark Fasheh <mark.fasheh@oracle.com>
parent 4bcec184

fs/ocfs2/alloc.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -1170,7 +1170,7 @@ static int __ocfs2_flush_truncate_log(struct ocfs2_super *osb) 
	if (status < 0)

	if (status < 0)

		mlog_errno(status);

		mlog_errno(status);





	ocfs2_commit_trans(handle);

	ocfs2_commit_trans(osb, handle);





out_unlock:

out_unlock:

	brelse(data_alloc_bh);

	brelse(data_alloc_bh);
@@ -1379,7 +1379,7 @@ int ocfs2_complete_truncate_log_recovery(struct ocfs2_super *osb, 




		status = ocfs2_truncate_log_append(osb, handle,

		status = ocfs2_truncate_log_append(osb, handle,

						   start_blk, clusters);

						   start_blk, clusters);

		ocfs2_commit_trans(handle);

		ocfs2_commit_trans(osb, handle);

		if (status < 0) {

		if (status < 0) {

			mlog_errno(status);

			mlog_errno(status);

			goto bail_up;

			goto bail_up;
@@ -1883,7 +1883,7 @@ int ocfs2_commit_truncate(struct ocfs2_super *osb, 
	mutex_unlock(&tl_inode->i_mutex);

	mutex_unlock(&tl_inode->i_mutex);

	tl_sem = 0;

	tl_sem = 0;





	ocfs2_commit_trans(handle);

	ocfs2_commit_trans(osb, handle);

	handle = NULL;

	handle = NULL;





	BUG_ON(le32_to_cpu(fe->i_clusters) < target_i_clusters);

	BUG_ON(le32_to_cpu(fe->i_clusters) < target_i_clusters);
@@ -1898,7 +1898,7 @@ int ocfs2_commit_truncate(struct ocfs2_super *osb, 
		mutex_unlock(&tl_inode->i_mutex);

		mutex_unlock(&tl_inode->i_mutex);





	if (handle)

	if (handle)

		ocfs2_commit_trans(handle);

		ocfs2_commit_trans(osb, handle);





	if (last_eb_bh)

	if (last_eb_bh)

		brelse(last_eb_bh);

		brelse(last_eb_bh);

fs/ocfs2/aops.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -382,7 +382,7 @@ struct ocfs2_journal_handle *ocfs2_start_walk_page_trans(struct inode *inode, 
out:

out:

	if (ret) {

	if (ret) {

		if (handle)

		if (handle)

			ocfs2_commit_trans(handle);

			ocfs2_commit_trans(osb, handle);

		handle = ERR_PTR(ret);

		handle = ERR_PTR(ret);

	}

	}

	return handle;

	return handle;
@@ -464,7 +464,7 @@ static int ocfs2_commit_write(struct file *file, struct page *page, 
	}

	}





out_commit:

out_commit:

	ocfs2_commit_trans(handle);

	ocfs2_commit_trans(OCFS2_SB(inode->i_sb), handle);

out_unlock_data:

out_unlock_data:

	ocfs2_data_unlock(inode, 1);

	ocfs2_data_unlock(inode, 1);

out_unlock_meta:

out_unlock_meta:

fs/ocfs2/dir.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -488,7 +488,7 @@ static int ocfs2_extend_dir(struct ocfs2_super *osb, 
	get_bh(*new_de_bh);

	get_bh(*new_de_bh);

bail:

bail:

	if (handle)

	if (handle)

		ocfs2_commit_trans(handle);

		ocfs2_commit_trans(osb, handle);





	if (data_ac)

	if (data_ac)

		ocfs2_free_alloc_context(data_ac);

		ocfs2_free_alloc_context(data_ac);

fs/ocfs2/file.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -178,7 +178,7 @@ static int ocfs2_simple_size_update(struct inode *inode, 
	if (ret < 0)

	if (ret < 0)

		mlog_errno(ret);

		mlog_errno(ret);





	ocfs2_commit_trans(handle);

	ocfs2_commit_trans(osb, handle);

out:

out:

	return ret;

	return ret;

}

}
@@ -207,7 +207,7 @@ static int ocfs2_orphan_for_truncate(struct ocfs2_super *osb, 
	if (status < 0)

	if (status < 0)

		mlog_errno(status);

		mlog_errno(status);





	ocfs2_commit_trans(handle);

	ocfs2_commit_trans(osb, handle);

out:

out:

	mlog_exit(status);

	mlog_exit(status);

	return status;

	return status;
@@ -576,7 +576,7 @@ static int ocfs2_extend_allocation(struct inode *inode, 
		drop_alloc_sem = 0;

		drop_alloc_sem = 0;

	}

	}

	if (handle) {

	if (handle) {

		ocfs2_commit_trans(handle);

		ocfs2_commit_trans(osb, handle);

		handle = NULL;

		handle = NULL;

	}

	}

	if (data_ac) {

	if (data_ac) {
@@ -655,7 +655,7 @@ static int ocfs2_write_zero_page(struct inode *inode, 
		ret = 0;

		ret = 0;





	if (handle)

	if (handle)

		ocfs2_commit_trans(handle);

		ocfs2_commit_trans(OCFS2_SB(inode->i_sb), handle);

out_unlock:

out_unlock:

	unlock_page(page);

	unlock_page(page);

	page_cache_release(page);

	page_cache_release(page);
@@ -850,7 +850,7 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr) 
		mlog_errno(status);

		mlog_errno(status);





bail_commit:

bail_commit:

	ocfs2_commit_trans(handle);

	ocfs2_commit_trans(osb, handle);

bail_unlock:

bail_unlock:

	ocfs2_meta_unlock(inode, 1);

	ocfs2_meta_unlock(inode, 1);

bail_unlock_rw:

bail_unlock_rw:
@@ -938,7 +938,7 @@ static int ocfs2_write_remove_suid(struct inode *inode) 
out_bh:

out_bh:

	brelse(bh);

	brelse(bh);

out_trans:

out_trans:

	ocfs2_commit_trans(handle);

	ocfs2_commit_trans(osb, handle);

out:

out:

	mlog_exit(ret);

	mlog_exit(ret);

	return ret;

	return ret;

fs/ocfs2/inode.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -538,7 +538,7 @@ static int ocfs2_truncate_for_delete(struct ocfs2_super *osb, 
		goto bail;

		goto bail;

	}

	}





	ocfs2_commit_trans(handle);

	ocfs2_commit_trans(osb, handle);

	handle = NULL;

	handle = NULL;





	status = ocfs2_prepare_truncate(osb, inode, fe_bh, &tc);

	status = ocfs2_prepare_truncate(osb, inode, fe_bh, &tc);
@@ -554,7 +554,7 @@ static int ocfs2_truncate_for_delete(struct ocfs2_super *osb, 
	}

	}

bail:

bail:

	if (handle)

	if (handle)

		ocfs2_commit_trans(handle);

		ocfs2_commit_trans(osb, handle);





	mlog_exit(status);

	mlog_exit(status);

	return status;

	return status;
@@ -629,7 +629,7 @@ static int ocfs2_remove_inode(struct inode *inode, 
		mlog_errno(status);

		mlog_errno(status);





bail_commit:

bail_commit:

	ocfs2_commit_trans(handle);

	ocfs2_commit_trans(osb, handle);

bail_unlock:

bail_unlock:

	ocfs2_meta_unlock(inode_alloc_inode, 1);

	ocfs2_meta_unlock(inode_alloc_inode, 1);

	mutex_unlock(&inode_alloc_inode->i_mutex);

	mutex_unlock(&inode_alloc_inode->i_mutex);