diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-09-26 21:36:20 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-09-26 21:36:20 +0300 |
| commit | 2268419e4c9559ec1e80ee7ae7bd54f8976234cb (patch) | |
| tree | f135d7cc61dae81d88cf023abbd3c687033437c5 /fs/xfs/scrub/alloc.c | |
| parent | dadedd85630af28b21c826265f7a651f040f6f13 (diff) | |
| parent | 88d32d3983e72f2a7de72a49b701e2529c48e9c1 (diff) | |
| download | linux-2268419e4c9559ec1e80ee7ae7bd54f8976234cb.tar.xz | |
Merge tag 'xfs-5.4-merge-8' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
Pull xfs fixes from Darrick Wong:
"There are a couple of bug fixes and some small code cleanups that came
in recently:
- Minor code cleanups
- Fix a superblock logging error
- Ensure that collapse range converts the data fork to extents format
when necessary
- Revert the ALLOC_USERDATA cleanup because it caused subtle behavior
regressions"
* tag 'xfs-5.4-merge-8' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
xfs: avoid unused to_mp() function warning
xfs: log proper length of superblock
xfs: revert 1baa2800e62d ("xfs: remove the unused XFS_ALLOC_USERDATA flag")
xfs: removed unneeded variable
xfs: convert inode to extent format after extent merge due to shift
Diffstat (limited to 'fs/xfs/scrub/alloc.c')
| -rw-r--r-- | fs/xfs/scrub/alloc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/xfs/scrub/alloc.c b/fs/xfs/scrub/alloc.c index a43d1813c4ff..5533e48e605d 100644 --- a/fs/xfs/scrub/alloc.c +++ b/fs/xfs/scrub/alloc.c @@ -97,7 +97,6 @@ xchk_allocbt_rec( xfs_agnumber_t agno = bs->cur->bc_private.a.agno; xfs_agblock_t bno; xfs_extlen_t len; - int error = 0; bno = be32_to_cpu(rec->alloc.ar_startblock); len = be32_to_cpu(rec->alloc.ar_blockcount); @@ -109,7 +108,7 @@ xchk_allocbt_rec( xchk_allocbt_xref(bs->sc, bno, len); - return error; + return 0; } /* Scrub the freespace btrees for some AG. */ |