From: Darrick J. Wong Date: Tue, 27 Aug 2019 00:06:01 +0000 (-0700) Subject: xfs: don't return _QUERY_ABORT from xfs_rmap_has_other_keys X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=7380e8fec16b3527baa1153255da9cc8d5d4d309;p=linux.git xfs: don't return _QUERY_ABORT from xfs_rmap_has_other_keys 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 Reviewed-by: Dave Chinner --- diff --git a/fs/xfs/libxfs/xfs_rmap.c b/fs/xfs/libxfs/xfs_rmap.c index 12a61f0c1e6af..0769aca4192ba 100644 --- 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 = {