lkml.org 
[lkml]   [2010]   [Sep]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 22/41] block: make __blk_rq_prep_clone() copy most command flags
    Date
    Currently __blk_rq_prep_clone() copies only REQ_WRITE and REQ_DISCARD.
    There's no reason to omit other command flags and REQ_FUA needs to be
    copied to implement FUA support in request-based dm.

    REQ_COMMON_MASK which specifies flags to be copied from bio to request
    already identifies all the command flags. Define REQ_CLONE_MASK to be
    the same as REQ_COMMON_MASK for clarity and make __blk_rq_prep_clone()
    copy all flags in the mask.

    Signed-off-by: Tejun Heo <tj@kernel.org>
    Reviewed-by: Christoph Hellwig <hch@lst.de>
    ---
    block/blk-core.c | 4 +---
    include/linux/blk_types.h | 1 +
    2 files changed, 2 insertions(+), 3 deletions(-)

    diff --git a/block/blk-core.c b/block/blk-core.c
    index 495bdc4..2a5b192 100644
    --- a/block/blk-core.c
    +++ b/block/blk-core.c
    @@ -2505,9 +2505,7 @@ EXPORT_SYMBOL_GPL(blk_rq_unprep_clone);
    static void __blk_rq_prep_clone(struct request *dst, struct request *src)
    {
    dst->cpu = src->cpu;
    - dst->cmd_flags = (rq_data_dir(src) | REQ_NOMERGE);
    - if (src->cmd_flags & REQ_DISCARD)
    - dst->cmd_flags |= REQ_DISCARD;
    + dst->cmd_flags = (src->cmd_flags & REQ_CLONE_MASK) | REQ_NOMERGE;
    dst->cmd_type = src->cmd_type;
    dst->__sector = blk_rq_pos(src);
    dst->__data_len = blk_rq_bytes(src);
    diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h
    index 1797994..36edadf 100644
    --- a/include/linux/blk_types.h
    +++ b/include/linux/blk_types.h
    @@ -168,6 +168,7 @@ enum rq_flag_bits {
    #define REQ_COMMON_MASK \
    (REQ_WRITE | REQ_FAILFAST_MASK | REQ_HARDBARRIER | REQ_SYNC | \
    REQ_META | REQ_DISCARD | REQ_NOIDLE | REQ_FLUSH | REQ_FUA)
    +#define REQ_CLONE_MASK REQ_COMMON_MASK

    #define REQ_UNPLUG (1 << __REQ_UNPLUG)
    #define REQ_RAHEAD (1 << __REQ_RAHEAD)
    --
    1.7.1


    \
     
     \ /
      Last update: 2010-09-03 12:47    [W:0.024 / U:29.844 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site