From 22c7d6ab0dc33c4f3f81fc13340e5d725fa4eaa1 Mon Sep 17 00:00:00 2001 From: Li Zefan Date: Thu, 2 Apr 2009 13:43:26 +0800 Subject: [PATCH] --- yaml --- r: 142770 b: refs/heads/master c: e2494e1b42ebac402324105d57646489d19e2b01 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/block/blk-core.c | 1 + trunk/kernel/trace/blktrace.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 810889566c8e..e6b63dad7843 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7635b03adf3d7b84da7649b81efa91e6ebf11b85 +refs/heads/master: e2494e1b42ebac402324105d57646489d19e2b01 diff --git a/trunk/block/blk-core.c b/trunk/block/blk-core.c index 29bcfac6c688..859879d0a0bf 100644 --- a/trunk/block/blk-core.c +++ b/trunk/block/blk-core.c @@ -132,6 +132,7 @@ void blk_rq_init(struct request_queue *q, struct request *rq) INIT_HLIST_NODE(&rq->hash); RB_CLEAR_NODE(&rq->rb_node); rq->cmd = rq->__cmd; + rq->cmd_len = BLK_MAX_CDB; rq->tag = -1; rq->ref_count = 1; } diff --git a/trunk/kernel/trace/blktrace.c b/trunk/kernel/trace/blktrace.c index 73d7860b72e2..b32ff446c3fb 100644 --- a/trunk/kernel/trace/blktrace.c +++ b/trunk/kernel/trace/blktrace.c @@ -643,7 +643,7 @@ static void blk_add_trace_rq(struct request_queue *q, struct request *rq, if (blk_pc_request(rq)) { what |= BLK_TC_ACT(BLK_TC_PC); __blk_add_trace(bt, 0, rq->data_len, rw, what, rq->errors, - sizeof(rq->cmd), rq->cmd); + rq->cmd_len, rq->cmd); } else { what |= BLK_TC_ACT(BLK_TC_FS); __blk_add_trace(bt, rq->hard_sector, rq->hard_nr_sectors << 9,