mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-08-05 16:54:27 +00:00
xfs: revert commit 44af6c7e59
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: 44af6c7e59
("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>
This commit is contained in:
parent
67ac7091e3
commit
2a009397eb
1 changed files with 5 additions and 8 deletions
|
@ -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 */
|
||||
|
|
Loading…
Add table
Reference in a new issue