From 96cfbbf0ea9fce7ecaa9e03964474f407f6e76ab Mon Sep 17 00:00:00 2001 From: Patrik Lundquist Date: Wed, 24 Jun 2015 16:21:06 +0200 Subject: btrfs-progs: fix defrag threshold overflow btrfs fi defrag -t 1T overflows the u32 thresh variable and default, instead of max, threshold is used. Signed-off-by: Patrik Lundquist Signed-off-by: David Sterba --- cmds-filesystem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cmds-filesystem.c') diff --git a/cmds-filesystem.c b/cmds-filesystem.c index 530f815..72bb45b 100644 --- a/cmds-filesystem.c +++ b/cmds-filesystem.c @@ -1127,7 +1127,7 @@ static int cmd_defrag(int argc, char **argv) int flush = 0; u64 start = 0; u64 len = (u64)-1; - u32 thresh = 0; + u64 thresh = 0; int i; int recursive = 0; int ret = 0; @@ -1186,7 +1186,7 @@ static int cmd_defrag(int argc, char **argv) memset(&defrag_global_range, 0, sizeof(range)); defrag_global_range.start = start; defrag_global_range.len = len; - defrag_global_range.extent_thresh = thresh; + defrag_global_range.extent_thresh = thresh > (u32)-1 ? (u32)-1 : (u32)thresh; if (compress_type) { defrag_global_range.flags |= BTRFS_DEFRAG_RANGE_COMPRESS; defrag_global_range.compress_type = compress_type; -- cgit v1.2.3