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

Commit 0c748e95 authored by Joel Becker's avatar Joel Becker Committed by Mark Fasheh
Browse files

ocfs2: Pass value buf to ocfs2_xattr_update_entry(). 



ocfs2_xattr_update_entry() updates the entry portion of an xattr buffer.
This can be part of multiple metadata block types, so pass the buffer in
via an ocfs2_xattr_value_buf.

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

fs/ocfs2/xattr.c

+6 −4
Original line number Diff line number Diff line
@@ -1282,11 +1282,12 @@ static int ocfs2_xattr_update_entry(struct inode *inode, 
				    handle_t *handle,

				    struct ocfs2_xattr_info *xi,

				    struct ocfs2_xattr_search *xs,

				    struct ocfs2_xattr_value_buf *vb,

				    size_t offs)

{

	int ret;



	ret = ocfs2_journal_access(handle, inode, xs->xattr_bh,

	ret = vb->vb_access(handle, inode, vb->vb_bh,

			    OCFS2_JOURNAL_ACCESS_WRITE);

	if (ret) {

		mlog_errno(ret);
@@ -1301,7 +1302,7 @@ static int ocfs2_xattr_update_entry(struct inode *inode, 
		ocfs2_xattr_set_local(xs->here, 0);

	ocfs2_xattr_hash_entry(inode, xs->header, xs->here);



	ret = ocfs2_journal_dirty(handle, xs->xattr_bh);

	ret = ocfs2_journal_dirty(handle, vb->vb_bh);

	if (ret < 0)

		mlog_errno(ret);

out:
@@ -1345,7 +1346,7 @@ static int ocfs2_xattr_set_value_outside(struct inode *inode, 
		mlog_errno(ret);

		return ret;

	}

	ret = ocfs2_xattr_update_entry(inode, ctxt->handle, xi, xs, offs);

	ret = ocfs2_xattr_update_entry(inode, ctxt->handle, xi, xs, &vb, offs);

	if (ret < 0) {

		mlog_errno(ret);

		return ret;
@@ -1574,6 +1575,7 @@ static int ocfs2_xattr_set_entry(struct inode *inode, 
							       handle,

							       xi,

							       xs,

							       &vb,

							       offs);

				if (ret < 0) {

					mlog_errno(ret);