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

Commit 84008972 authored Dec 09, 2008 by Joel Becker Committed by Mark Fasheh Jan 05, 2009

ocfs2: Use proper journal_access function in xattr.c



Change the rest of the naked ocfs2_journal_access() calls in
fs/ocfs2/xattr.c to use the appropriate ocfs2_journal_access_*() call
for their metadata type.

Signed-off-by: Joel Becker <joel.becker@oracle.com>
Signed-off-by: Mark Fasheh <mfasheh@suse.com>

parent 4311901d

fs/ocfs2/xattr.c

+12 −12

Original line number	Diff line number	Diff line
		@@ -1894,7 +1894,7 @@ int ocfs2_xattr_remove(struct inode inode, struct buffer_head di_bh)
		mlog_errno(ret);
		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);
		@@ -2103,7 +2103,7 @@ static int ocfs2_xattr_block_set(struct inode *inode,
		int ret;

		if (!xs->xattr_bh) {
		ret = ocfs2_journal_access(handle, inode, xs->inode_bh,
		ret = ocfs2_journal_access_di(handle, inode, xs->inode_bh,
		OCFS2_JOURNAL_ACCESS_CREATE);
		if (ret < 0) {
		mlog_errno(ret);
		@@ -2121,7 +2121,7 @@ static int ocfs2_xattr_block_set(struct inode *inode,
		new_bh = sb_getblk(inode->i_sb, first_blkno);
		ocfs2_set_new_buffer_uptodate(inode, new_bh);

		ret = ocfs2_journal_access(handle, inode, new_bh,
		ret = ocfs2_journal_access_xb(handle, inode, new_bh,
		OCFS2_JOURNAL_ACCESS_CREATE);
		if (ret < 0) {
		mlog_errno(ret);
		@@ -3377,7 +3377,7 @@ static int ocfs2_xattr_create_index_block(struct inode *inode,
		*/
		down_write(&oi->ip_alloc_sem);

		ret = ocfs2_journal_access(handle, inode, xb_bh,
		ret = ocfs2_journal_access_xb(handle, inode, xb_bh,
		OCFS2_JOURNAL_ACCESS_WRITE);
		if (ret) {
		mlog_errno(ret);
		@@ -4216,7 +4216,7 @@ static int ocfs2_add_new_xattr_cluster(struct inode *inode,

		ocfs2_init_xattr_tree_extent_tree(&et, inode, root_bh);

		ret = ocfs2_journal_access(handle, inode, root_bh,
		ret = ocfs2_journal_access_xb(handle, inode, root_bh,
		OCFS2_JOURNAL_ACCESS_WRITE);
		if (ret < 0) {
		mlog_errno(ret);
		@@ -4808,7 +4808,7 @@ static int ocfs2_rm_xattr_cluster(struct inode *inode,
		goto out;
		}

		ret = ocfs2_journal_access(handle, inode, root_bh,
		ret = ocfs2_journal_access_xb(handle, inode, root_bh,
		OCFS2_JOURNAL_ACCESS_WRITE);
		if (ret) {
		mlog_errno(ret);