diff options
| author | Darrick J. Wong <darrick.wong@oracle.com> | 2019-04-16 08:21:59 -0700 |
|---|---|---|
| committer | Darrick J. Wong <darrick.wong@oracle.com> | 2019-04-16 10:01:57 -0700 |
| commit | f8c2a2257ca12fb3a04830bbacc85ce860f04ba9 (patch) | |
| tree | 6f7c3b5d9e07ddf2dd643008df046122fdc2add0 /fs/xfs/scrub/ialloc.c | |
| parent | 9d71e15586fd7d274a23dd0bbf54278c86fe263f (diff) | |
| download | lwn-f8c2a2257ca12fb3a04830bbacc85ce860f04ba9.tar.gz lwn-f8c2a2257ca12fb3a04830bbacc85ce860f04ba9.zip | |
xfs: collapse scrub bool state flags into a single unsigned int
Combine all the boolean state flags in struct xfs_scrub into a single
unsigned int, because we're going to be adding more state flags soon.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Diffstat (limited to 'fs/xfs/scrub/ialloc.c')
| -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 700114f79a7d..693eb51f5efb 100644 --- a/fs/xfs/scrub/ialloc.c +++ b/fs/xfs/scrub/ialloc.c @@ -39,7 +39,7 @@ xchk_setup_ag_iallocbt( struct xfs_scrub *sc, struct xfs_inode *ip) { - return xchk_setup_ag_btree(sc, ip, sc->try_harder); + return xchk_setup_ag_btree(sc, ip, sc->flags & XCHK_TRY_HARDER); } /* Inode btree scrubber. */ @@ -185,7 +185,7 @@ xchk_iallocbt_check_cluster_ifree( if (error == -ENODATA) { /* Not cached, just read the disk buffer */ freemask_ok = irec_free ^ !!(dip->di_mode); - if (!bs->sc->try_harder && !freemask_ok) + if (!(bs->sc->flags & XCHK_TRY_HARDER) && !freemask_ok) return -EDEADLOCK; } else if (error < 0) { /* |