Commit 2a009397 authored by Darrick J. Wong's avatar Darrick J. Wong

xfs: revert commit 44af6c7e

In my haste to fix what I thought was a performance problem in the attr
scrub code, I neglected to notice that the xfs_attr_get_ilocked also had
the effect of checking that attributes can actually be looked up through
the attr dabtree.  Fix this.

Fixes: 44af6c7e ("xfs: don't load local xattr values during scrub")
Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent 67ac7091
...@@ -208,14 +208,6 @@ xchk_xattr_actor( ...@@ -208,14 +208,6 @@ xchk_xattr_actor(
return -ECANCELED; return -ECANCELED;
} }
/*
* Local and shortform xattr values are stored in the attr leaf block,
* so we don't need to retrieve the value from a remote block to detect
* corruption problems.
*/
if (value)
return 0;
/* /*
* Try to allocate enough memory to extract the attr value. If that * Try to allocate enough memory to extract the attr value. If that
* doesn't work, return -EDEADLOCK as a signal to try again with a * doesn't work, return -EDEADLOCK as a signal to try again with a
...@@ -229,6 +221,11 @@ xchk_xattr_actor( ...@@ -229,6 +221,11 @@ xchk_xattr_actor(
args.value = ab->value; args.value = ab->value;
/*
* Get the attr value to ensure that lookup can find this attribute
* through the dabtree indexing and that remote value retrieval also
* works correctly.
*/
xfs_attr_sethash(&args); xfs_attr_sethash(&args);
error = xfs_attr_get_ilocked(&args); error = xfs_attr_get_ilocked(&args);
/* ENODATA means the hash lookup failed and the attr is bad */ /* ENODATA means the hash lookup failed and the attr is bad */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment