Commit 80f5c33f authored by Kevin Wolf's avatar Kevin Wolf
Browse files

block: Advertise BDRV_REQ_NO_FALLBACK in filter drivers 



Filter drivers that support .bdrv_co_pwrite_zeroes can safely advertise
BDRV_REQ_NO_FALLBACK because they just forward the request flags to
their child node.

Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Acked-by: default avatarEric Blake <eblake@redhat.com>
parent fe0480d6

block/blkdebug.c

+1 −1
Original line number Diff line number Diff line
@@ -401,7 +401,7 @@ static int blkdebug_open(BlockDriverState *bs, QDict *options, int flags, 
    bs->supported_write_flags = BDRV_REQ_WRITE_UNCHANGED |

        (BDRV_REQ_FUA & bs->file->bs->supported_write_flags);

    bs->supported_zero_flags = BDRV_REQ_WRITE_UNCHANGED |

        ((BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP) &

        ((BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP | BDRV_REQ_NO_FALLBACK) &

            bs->file->bs->supported_zero_flags);

    ret = -EINVAL;

block/copy-on-read.c

+3 −4
Original line number Diff line number Diff line
@@ -34,11 +34,10 @@ static int cor_open(BlockDriverState *bs, QDict *options, int flags, 
    }



    bs->supported_write_flags = BDRV_REQ_WRITE_UNCHANGED |

                                (BDRV_REQ_FUA &

                                    bs->file->bs->supported_write_flags);

        (BDRV_REQ_FUA & bs->file->bs->supported_write_flags);



    bs->supported_zero_flags = BDRV_REQ_WRITE_UNCHANGED |

                               ((BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP) &

        ((BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP | BDRV_REQ_NO_FALLBACK) &

            bs->file->bs->supported_zero_flags);



    return 0;

block/mirror.c

+2 −1
Original line number Diff line number Diff line
@@ -1548,7 +1548,8 @@ static void mirror_start_job(const char *job_id, BlockDriverState *bs, 
    }

    mirror_top_bs->total_sectors = bs->total_sectors;

    mirror_top_bs->supported_write_flags = BDRV_REQ_WRITE_UNCHANGED;

    mirror_top_bs->supported_zero_flags = BDRV_REQ_WRITE_UNCHANGED;

    mirror_top_bs->supported_zero_flags = BDRV_REQ_WRITE_UNCHANGED |

                                          BDRV_REQ_NO_FALLBACK;

    bs_opaque = g_new0(MirrorBDSOpaque, 1);

    mirror_top_bs->opaque = bs_opaque;

    bdrv_set_aio_context(mirror_top_bs, bdrv_get_aio_context(bs));

block/raw-format.c

+1 −1
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ static int raw_open(BlockDriverState *bs, QDict *options, int flags, 
    bs->supported_write_flags = BDRV_REQ_WRITE_UNCHANGED |

        (BDRV_REQ_FUA & bs->file->bs->supported_write_flags);

    bs->supported_zero_flags = BDRV_REQ_WRITE_UNCHANGED |

        ((BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP) &

        ((BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP | BDRV_REQ_NO_FALLBACK) &

            bs->file->bs->supported_zero_flags);



    if (bs->probed && !bdrv_is_read_only(bs)) {