diff options
| author | Chris Mason <clm@fb.com> | 2017-06-23 09:48:21 -0700 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2017-06-29 20:17:02 +0200 |
| commit | 6374e57ad8091b9c2db2eecc536c7f0166ce099e (patch) | |
| tree | f4a5c584983c110e0b2ddc9e3b51c25e11801353 /fs/btrfs/scrub.c | |
| parent | ded56184a562b925a588b6e78688e2e60757b425 (diff) | |
| download | lwn-6374e57ad8091b9c2db2eecc536c7f0166ce099e.tar.gz lwn-6374e57ad8091b9c2db2eecc536c7f0166ce099e.zip | |
btrfs: fix integer overflow in calc_reclaim_items_nr
Dave Jones hit a WARN_ON(nr < 0) in btrfs_wait_ordered_roots() with
v4.12-rc6. This was because commit 70e7af244 made it possible for
calc_reclaim_items_nr() to return a negative number. It's not really a
bug in that commit, it just didn't go far enough down the stack to find
all the possible 64->32 bit overflows.
This switches calc_reclaim_items_nr() to return a u64 and changes everyone
that uses the results of that math to u64 as well.
Reported-by: Dave Jones <davej@codemonkey.org.uk>
Fixes: 70e7af2 ("Btrfs: fix delalloc accounting leak caused by u32 overflow")
Signed-off-by: Chris Mason <clm@fb.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/scrub.c')
| -rw-r--r-- | fs/btrfs/scrub.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c index 738e784ba20d..0cebeb5eb5d0 100644 --- a/fs/btrfs/scrub.c +++ b/fs/btrfs/scrub.c @@ -3836,7 +3836,7 @@ int scrub_enumerate_chunks(struct scrub_ctx *sctx, */ btrfs_wait_block_group_reservations(cache); btrfs_wait_nocow_writers(cache); - ret = btrfs_wait_ordered_roots(fs_info, -1, + ret = btrfs_wait_ordered_roots(fs_info, U64_MAX, cache->key.objectid, cache->key.offset); if (ret > 0) { |