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

Commit 9f868f16 authored by Tao Ma's avatar Tao Ma Committed by Mark Fasheh
Browse files

ocfs2/xattr: Restore not_found in xis 



During an xattr set, when we move a xattr which was stored in inode to the
outside bucket, we have to delete it and it will use the old value of
xis->not_found. xis->not_found is removed by ocfs2_calc_xattr_set_need
though, so we must restore it.

Signed-off-by: default avatarTao Ma <tao.ma@oracle.com>
Signed-off-by: default avatarMark Fasheh <mfasheh@suse.com>
parent 97aff52a

fs/ocfs2/xattr.c

+5 −1
Original line number Diff line number Diff line
@@ -2414,7 +2414,7 @@ static int __ocfs2_xattr_set_handle(struct inode *inode, 
				    struct ocfs2_xattr_search *xbs,

				    struct ocfs2_xattr_set_ctxt *ctxt)

{

	int ret = 0, credits;

	int ret = 0, credits, old_found;



	if (!xi->value) {

		/* Remove existing extended attribute */
@@ -2433,6 +2433,7 @@ static int __ocfs2_xattr_set_handle(struct inode *inode, 
			xi->value = NULL;

			xi->value_len = 0;



			old_found = xis->not_found;

			xis->not_found = -ENODATA;

			ret = ocfs2_calc_xattr_set_need(inode,

							di,
@@ -2442,6 +2443,7 @@ static int __ocfs2_xattr_set_handle(struct inode *inode, 
							NULL,

							NULL,

							&credits);

			xis->not_found = old_found;

			if (ret) {

				mlog_errno(ret);

				goto out;
@@ -2462,6 +2464,7 @@ static int __ocfs2_xattr_set_handle(struct inode *inode, 
				if (ret)

					goto out;



				old_found = xis->not_found;

				xis->not_found = -ENODATA;

				ret = ocfs2_calc_xattr_set_need(inode,

								di,
@@ -2471,6 +2474,7 @@ static int __ocfs2_xattr_set_handle(struct inode *inode, 
								NULL,

								NULL,

								&credits);

				xis->not_found = old_found;

				if (ret) {

					mlog_errno(ret);

					goto out;