From 1fa9653dc809ca05c21a2127c9faf15f04bd8ef8 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Fri, 25 Aug 2017 16:20:16 +0200 Subject: btrfs-progs: drop local blocksize variables if they're nodesize Prep work so we can drop the blocksize argument from several functions. Signed-off-by: David Sterba --- image/main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'image/main.c') diff --git a/image/main.c b/image/main.c index 80588e81..4911100d 100644 --- a/image/main.c +++ b/image/main.c @@ -919,7 +919,6 @@ static int flush_pending(struct metadump_struct *md, int done) { struct async_work *async = NULL; struct extent_buffer *eb; - u64 blocksize = md->root->fs_info->nodesize; u64 start = 0; u64 size; size_t offset; @@ -972,7 +971,9 @@ static int flush_pending(struct metadump_struct *md, int done) } while (!md->data && size > 0) { - u64 this_read = min(blocksize, size); + u64 this_read = min((u64)md->root->fs_info->nodesize, + size); + eb = read_tree_block(md->root->fs_info, start, this_read, 0); if (!extent_buffer_uptodate(eb)) { -- cgit v1.2.3