| Message ID | 1435155666-11214-1-git-send-email-patrik.lundquist@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Wed, Jun 24, 2015 at 04:21:06PM +0200, Patrik Lundquist wrote: > btrfs fi defrag -t 1T overflows the u32 thresh variable and default, instead of max, threshold is used. > > Signed-off-by: Patrik Lundquist <patrik.lundquist@gmail.com> Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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;
btrfs fi defrag -t 1T overflows the u32 thresh variable and default, instead of max, threshold is used. Signed-off-by: Patrik Lundquist <patrik.lundquist@gmail.com> --- cmds-filesystem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)