projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c94613f
)
xfs: don't return _QUERY_ABORT from xfs_rmap_has_other_keys
author
Darrick J. Wong
<darrick.wong@oracle.com>
Tue, 27 Aug 2019 00:06:01 +0000
(17:06 -0700)
committer
Darrick J. Wong
<darrick.wong@oracle.com>
Wed, 28 Aug 2019 15:31:01 +0000
(08:31 -0700)
The xfs_rmap_has_other_keys helper aborts the iteration as soon as it
has an answer. Don't let this abort leak out to callers.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
fs/xfs/libxfs/xfs_rmap.c
patch
|
blob
|
history
diff --git
a/fs/xfs/libxfs/xfs_rmap.c
b/fs/xfs/libxfs/xfs_rmap.c
index
12a61f0
..
0769aca
100644
(file)
--- a/
fs/xfs/libxfs/xfs_rmap.c
+++ b/
fs/xfs/libxfs/xfs_rmap.c
@@
-2540,8
+2540,11
@@
xfs_rmap_has_other_keys(
error = xfs_rmap_query_range(cur, &low, &high,
xfs_rmap_has_other_keys_helper, &rks);
+ if (error < 0)
+ return error;
+
*has_rmap = rks.has_rmap;
- return
error
;
+ return
0
;
}
const struct xfs_owner_info XFS_RMAP_OINFO_SKIP_UPDATE = {