From 7feb73c514a6c52bdc687de48252de85ffd5b61f Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Fri, 3 Sep 2010 11:56:18 +0200 Subject: [PATCH] --- yaml --- r: 213192 b: refs/heads/master c: 3a2edd0d6ddbd5fa3b389ea6db811285415ce6c8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/block/blk-core.c | 4 +--- trunk/include/linux/blk_types.h | 1 + 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 808322f6c867..4e7f7c680ba3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e9c7469bb4f502dafc092166201bea1ad5fc0fbf +refs/heads/master: 3a2edd0d6ddbd5fa3b389ea6db811285415ce6c8 diff --git a/trunk/block/blk-core.c b/trunk/block/blk-core.c index 495bdc4a23da..2a5b19204546 100644 --- a/trunk/block/blk-core.c +++ b/trunk/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/trunk/include/linux/blk_types.h b/trunk/include/linux/blk_types.h index 179799479e6f..36edadf5b41a 100644 --- a/trunk/include/linux/blk_types.h +++ b/trunk/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)