diff options
| author | Darrick J. Wong <darrick.wong@oracle.com> | 2018-01-23 11:17:47 -0800 |
|---|---|---|
| committer | Darrick J. Wong <darrick.wong@oracle.com> | 2018-01-29 07:27:23 -0800 |
| commit | c47b74fb2dba46642fc9c2581a28893b42a42815 (patch) | |
| tree | 01cb59d90f7bd7f13f58632e8346929dd94f8bee /fs | |
| parent | 70c57dcd606f218b507372a05e633b23351258f0 (diff) | |
| download | linux-c47b74fb2dba46642fc9c2581a28893b42a42815.tar.bz2 | |
xfs: don't clobber inobt/finobt cursors when xref with rmap
Even if we can't use the inobt/finobt cursors to count the number of
inode btree blocks, we are never allowed to clobber the cursor of the
btree being checked, so don't do this. Found by fuzzing level = ones
in xfs/364.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/xfs/scrub/ialloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/scrub/ialloc.c b/fs/xfs/scrub/ialloc.c index 21c850abbafd..63ab3f98430d 100644 --- a/fs/xfs/scrub/ialloc.c +++ b/fs/xfs/scrub/ialloc.c @@ -391,12 +391,12 @@ xfs_scrub_iallocbt_xref_rmap_btreeblks( /* Check that we saw as many inobt blocks as the rmap says. */ error = xfs_btree_count_blocks(sc->sa.ino_cur, &inobt_blocks); - if (!xfs_scrub_should_check_xref(sc, &error, &sc->sa.ino_cur)) + if (!xfs_scrub_process_error(sc, 0, 0, &error)) return; if (sc->sa.fino_cur) { error = xfs_btree_count_blocks(sc->sa.fino_cur, &finobt_blocks); - if (!xfs_scrub_should_check_xref(sc, &error, &sc->sa.fino_cur)) + if (!xfs_scrub_process_error(sc, 0, 0, &error)) return; } |