summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Lieven <pl@dlhnet.de>2013-03-11 11:03:28 +0100
committerMichael Roth <mdroth@linux.vnet.ibm.com>2013-04-04 17:35:43 -0500
commite4cce2d3e9dbdb1c82994f024c0c7e2d2661547e (patch)
treeed073869cccd2df6ed9be707a8a4792383c68d19
parentd15b1aa30c8b57e89beb41d67cd87cd4fbaacd8c (diff)
downloadqemu-e4cce2d3e9dbdb1c82994f024c0c7e2d2661547e.tar.gz
Revert "block: complete all IOs before .bdrv_truncate"
brdv_truncate() is also called from readv/writev commands on self- growing file based storage. this will result in requests waiting for theirselves to complete. This reverts commit 9a665b2b8640e464f0a778216fc2dca8d02acf33. Signed-off-by: Kevin Wolf <kwolf@redhat.com> (cherry picked from commit 5c916681ae2383f0425bb8a3680ade9d055f5dfe) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
-rw-r--r--block.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/block.c b/block.c
index 11f162bb2e..50dab8e595 100644
--- a/block.c
+++ b/block.c
@@ -2427,10 +2427,6 @@ int bdrv_truncate(BlockDriverState *bs, int64_t offset)
return -EACCES;
if (bdrv_in_use(bs))
return -EBUSY;
-
- /* There better not be any in-flight IOs when we truncate the device. */
- bdrv_drain_all();
-
ret = drv->bdrv_truncate(bs, offset);
if (ret == 0) {
ret = refresh_total_sectors(bs, offset >> BDRV_SECTOR_BITS);