Commit 16aaf975 authored by Kevin Wolf's avatar Kevin Wolf
Browse files

block: Don't ignore flags in blk_{,co,aio}_write_zeroes() 



Commit 57d6a428 neglected to pass the given flags to blk_aio_prwv(),
which broke discard by WRITE SAME for scsi-disk (the UNMAP bit would be
ignored).

Commit fc1453cd introduced the same bug for blk_write_zeroes(). This is
used for 'qemu-img convert' without has_zero_init (e.g. on a block
device) and for preallocation=falloc in parallels.

Commit 8896e088 is the version for blk_co_write_zeroes(). This function
is only used in qemu-io.

Reported-by: default avatarMax Reitz <mreitz@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
parent 9c057d0b

block/block-backend.c

+4 −3
Original line number Diff line number Diff line
@@ -820,7 +820,7 @@ int blk_write_zeroes(BlockBackend *blk, int64_t sector_num, 
                     int nb_sectors, BdrvRequestFlags flags)

{

    return blk_rw(blk, sector_num, NULL, nb_sectors, blk_write_entry,

                  BDRV_REQ_ZERO_WRITE);

                  flags | BDRV_REQ_ZERO_WRITE);

}



static void error_callback_bh(void *opaque)
@@ -942,7 +942,8 @@ BlockAIOCB *blk_aio_write_zeroes(BlockBackend *blk, int64_t sector_num, 


    return blk_aio_prwv(blk, sector_num << BDRV_SECTOR_BITS,

                        nb_sectors << BDRV_SECTOR_BITS, NULL,

                        blk_aio_write_entry, BDRV_REQ_ZERO_WRITE, cb, opaque);

                        blk_aio_write_entry, flags | BDRV_REQ_ZERO_WRITE,

                        cb, opaque);

}



int blk_pread(BlockBackend *blk, int64_t offset, void *buf, int count)
@@ -1452,7 +1453,7 @@ int coroutine_fn blk_co_write_zeroes(BlockBackend *blk, int64_t sector_num, 


    return blk_co_pwritev(blk, sector_num << BDRV_SECTOR_BITS,

                          nb_sectors << BDRV_SECTOR_BITS, NULL,

                          BDRV_REQ_ZERO_WRITE);

                          flags | BDRV_REQ_ZERO_WRITE);

}



int blk_write_compressed(BlockBackend *blk, int64_t sector_num,