[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/2] qemu-img: make sure contain the consecutive num
From: |
jemmy858585 |
Subject: |
[Qemu-devel] [PATCH 1/2] qemu-img: make sure contain the consecutive number of zero bytes |
Date: |
Sun, 23 Apr 2017 22:33:16 +0800 |
From: Lidong Chen <address@hidden>
is_allocated_sectors_min don't guarantee to contain the
consecutive number of zero bytes. this patch fixes this bug.
Signed-off-by: Lidong Chen <address@hidden>
---
qemu-img.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index b220cf7..df6d165 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -1060,9 +1060,9 @@ static int is_allocated_sectors(const uint8_t *buf, int
n, int *pnum)
}
/*
- * Like is_allocated_sectors, but if the buffer starts with a used sector,
- * up to 'min' consecutive sectors containing zeros are ignored. This avoids
- * breaking up write requests for only small sparse areas.
+ * Like is_allocated_sectors, but up to 'min' consecutive sectors
+ * containing zeros are ignored. This avoids breaking up write requests
+ * for only small sparse areas.
*/
static int is_allocated_sectors_min(const uint8_t *buf, int n, int *pnum,
int min)
@@ -1071,11 +1071,12 @@ static int is_allocated_sectors_min(const uint8_t *buf,
int n, int *pnum,
int num_checked, num_used;
if (n < min) {
- min = n;
+ *pnum = n;
+ return 1;
}
ret = is_allocated_sectors(buf, n, pnum);
- if (!ret) {
+ if (!ret && *pnum >= min) {
return ret;
}
--
1.8.3.1
- [Qemu-devel] [PATCH 1/2] qemu-img: make sure contain the consecutive number of zero bytes,
jemmy858585 <=
- [Qemu-devel] [PATCH 2/2] qemu-img: fix some spelling errors, jemmy858585, 2017/04/23
- Re: [Qemu-devel] [PATCH 2/2] qemu-img: fix some spelling errors, Eric Blake, 2017/04/24
- Re: [Qemu-devel] [PATCH 2/2] qemu-img: fix some spelling errors, Philippe Mathieu-Daudé, 2017/04/24
- Re: [Qemu-devel] [PATCH 2/2] qemu-img: fix some spelling errors, Eric Blake, 2017/04/24
- Re: [Qemu-devel] [PATCH 2/2] qemu-img: fix some spelling errors, Eric Blake, 2017/04/24
- Re: [Qemu-devel] [PATCH 2/2] qemu-img: fix some spelling errors, 858585 jemmy, 2017/04/24
- Re: [Qemu-devel] [PATCH 2/2] qemu-img: fix some spelling errors, Max Reitz, 2017/04/25
- Re: [Qemu-devel] [PATCH 2/2] qemu-img: fix some spelling errors, 858585 jemmy, 2017/04/26
Re: [Qemu-devel] [PATCH 1/2] qemu-img: make sure contain the consecutive number of zero bytes, Eric Blake, 2017/04/24