xfs: revert commit 44af6c7e59b12

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: 44af6c7e59b12 ("xfs: don't load local xattr values during scrub")
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>

diff --git a/fs/xfs/scrub/attr.c b/fs/xfs/scrub/attr.c
index c07d050b39b2eb04d09d1cab11c286622945c3ec..393ed36709b3a96cc3264e8226cbcbe05cb96d70 100644 (file)
--- a/fs/xfs/scrub/attr.c
+++ b/fs/xfs/scrub/attr.c
@@ -208,14 +208,6 @@ xchk_xattr_actor(
                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
         * doesn't work, return -EDEADLOCK as a signal to try again with a
@@ -229,6 +221,11 @@ xchk_xattr_actor(
 
        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);
        error = xfs_attr_get_ilocked(&args);
        /* ENODATA means the hash lookup failed and the attr is bad */