• E
    block: Simplify bdrv_can_write_zeroes_with_unmap() · e24d813b
    Eric Blake 提交于
    We don't need the can_write_zeroes_with_unmap field in
    BlockDriverInfo, because it is redundant information with
    supported_zero_flags & BDRV_REQ_MAY_UNMAP.  Note that
    BlockDriverInfo and supported_zero_flags are both per-device
    settings, rather than global state about the driver as a
    whole, which means one or both of these bits of information
    can already be conditional.  Let's audit how they were set:
    
    crypto: always setting can_write_ to false is pointless (the
    struct starts life zero-initialized), no use of supported_
    
    nbd: just recently fixed to set can_write_ if supported_
    includes MAY_UNMAP (thus this commit effectively reverts
    bca80059e and solves the problem mentioned there in a more
    global way)
    
    file-posix, iscsi, qcow2: can_write_ is conditional, while
    supported_ was unconditional; but passing MAY_UNMAP would
    fail with ENOTSUP if the condition wasn't met
    
    qed: can_write_ is unconditional, but pwrite_zeroes lacks
    support for MAY_UNMAP and supported_ is not set. Perhaps
    support can be added later (since it would be similar to
    qcow2), but for now claiming false is no real loss
    
    all other drivers: can_write_ is not set, and supported_ is
    either unset or a passthrough
    
    Simplify the code by moving the conditional into
    supported_zero_flags for all drivers, then dropping the
    now-unused BDI field.  For callers that relied on
    bdrv_can_write_zeroes_with_unmap(), we return the same
    per-device settings for drivers that had conditions (no
    observable change in behavior there); and can now return
    true (instead of false) for drivers that support passthrough
    (for example, the commit driver) which gives those drivers
    the same fix as nbd just got in bca80059e.  For callers that
    relied on supported_zero_flags, we now have a few more places
    that can avoid a wasted call to pwrite_zeroes() that will
    just fail with ENOTSUP.
    Suggested-by: NPaolo Bonzini <pbonzini@redhat.com>
    Signed-off-by: NEric Blake <eblake@redhat.com>
    Message-Id: <20180126193439.20219-1-eblake@redhat.com>
    Reviewed-by: NStefan Hajnoczi <stefanha@redhat.com>
    e24d813b
crypto.c 17.8 KB