From patchwork Fri Sep 18 15:13:23 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Junichi Nomura X-Patchwork-Id: 48546 Received: from hormel.redhat.com (hormel1.redhat.com [209.132.177.33]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n8IFQ5BQ007068 for ; Fri, 18 Sep 2009 15:26:05 GMT Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com [10.8.4.110]) by hormel.redhat.com (Postfix) with ESMTP id B5E8561869F; Fri, 18 Sep 2009 11:26:04 -0400 (EDT) Received: from int-mx04.intmail.prod.int.phx2.redhat.com (nat-pool.util.phx.redhat.com [10.8.5.200]) by listman.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP id n8IFQ2lT024880 for ; Fri, 18 Sep 2009 11:26:02 -0400 Received: from mx1.redhat.com (ext-mx05.extmail.prod.ext.phx2.redhat.com [10.5.110.9]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8IFQ0gN000970; Fri, 18 Sep 2009 11:26:00 -0400 Received: from tyo201.gate.nec.co.jp (TYO201.gate.nec.co.jp [202.32.8.193]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8IFPqnd023077; Fri, 18 Sep 2009 11:25:53 -0400 Received: from mailgate3.nec.co.jp ([10.7.69.161]) by tyo201.gate.nec.co.jp (8.13.8/8.13.4) with ESMTP id n8IFPfCA025416; Sat, 19 Sep 2009 00:25:41 +0900 (JST) Received: (from root@localhost) by mailgate3.nec.co.jp (8.11.7/3.7W-MAILGATE-NEC) id n8IFPfZ03549; Sat, 19 Sep 2009 00:25:41 +0900 (JST) Received: from mail03.kamome.nec.co.jp (mail03.kamome.nec.co.jp [10.25.43.7]) by mailsv.nec.co.jp (8.13.8/8.13.4) with ESMTP id n8IFPf5k011965; Sat, 19 Sep 2009 00:25:41 +0900 (JST) Received: from komachi.jp.nec.com ([10.26.220.10] [10.26.220.10]) by mail03.kamome.nec.co.jp with ESMTP id BT-MMP-2083664; Sat, 19 Sep 2009 00:13:24 +0900 Received: from [10.66.61.195] ([10.66.61.195] [10.66.61.195]) by mail.jp.nec.com with ESMTP; Sat, 19 Sep 2009 00:13:24 +0900 Message-ID: <4AB3A393.5000709@ce.jp.nec.com> Date: Sat, 19 Sep 2009 00:13:23 +0900 From: "Jun'ichi Nomura" User-Agent: Thunderbird 2.0.0.19 (Windows/20081209) MIME-Version: 1.0 To: Jens Axboe , Alasdair G Kergon , Li Zefan X-RedHat-Spam-Score: -1 (AWL) X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 X-Scanned-By: MIMEDefang 2.67 on 10.5.110.9 X-loop: dm-devel@redhat.com Cc: j-nomura@ce.jp.nec.com, device-mapper development , linux-kernel@vger.kernel.org Subject: [dm-devel] [PATCH 2/3] block: Rename trace_block_remap to trace_block_bio_remap X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.5 Precedence: junk Reply-To: device-mapper development List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com Rename "block_remap" tracepoint to "block_bio_remap" to clarify the event. No functional change. Signed-off-by: Kiyoshi Ueda Signed-off-by: Jun'ichi Nomura Cc: Jens Axboe Cc: Alasdair G Kergon Cc: Li Zefan --- block/blk-core.c | 10 +++++----- drivers/md/dm.c | 4 ++-- include/trace/events/block.h | 2 +- kernel/trace/blktrace.c | 10 +++++----- 4 files changed, 13 insertions(+), 13 deletions(-) -- dm-devel mailing list dm-devel@redhat.com https://www.redhat.com/mailman/listinfo/dm-devel Index: linux-2.6.31.work/include/trace/events/block.h =================================================================== --- linux-2.6.31.work.orig/include/trace/events/block.h +++ linux-2.6.31.work/include/trace/events/block.h @@ -453,7 +453,7 @@ TRACE_EVENT(block_split, __entry->comm) ); -TRACE_EVENT(block_remap, +TRACE_EVENT(block_bio_remap, TP_PROTO(struct request_queue *q, struct bio *bio, dev_t dev, sector_t from), Index: linux-2.6.31.work/block/blk-core.c =================================================================== --- linux-2.6.31.work.orig/block/blk-core.c +++ linux-2.6.31.work/block/blk-core.c @@ -33,7 +33,7 @@ #include "blk.h" -EXPORT_TRACEPOINT_SYMBOL_GPL(block_remap); +EXPORT_TRACEPOINT_SYMBOL_GPL(block_bio_remap); EXPORT_TRACEPOINT_SYMBOL_GPL(block_rq_remap); EXPORT_TRACEPOINT_SYMBOL_GPL(block_bio_complete); @@ -1285,9 +1285,9 @@ static inline void blk_partition_remap(s bio->bi_sector += p->start_sect; bio->bi_bdev = bdev->bd_contains; - trace_block_remap(bdev_get_queue(bio->bi_bdev), bio, - bdev->bd_dev, - bio->bi_sector - p->start_sect); + trace_block_bio_remap(bdev_get_queue(bio->bi_bdev), bio, + bdev->bd_dev, + bio->bi_sector - p->start_sect); } } @@ -1455,7 +1455,7 @@ static inline void __generic_make_reques goto end_io; if (old_sector != -1) - trace_block_remap(q, bio, old_dev, old_sector); + trace_block_bio_remap(q, bio, old_dev, old_sector); trace_block_bio_queue(q, bio); Index: linux-2.6.31.work/kernel/trace/blktrace.c =================================================================== --- linux-2.6.31.work.orig/kernel/trace/blktrace.c +++ linux-2.6.31.work/kernel/trace/blktrace.c @@ -822,7 +822,7 @@ static void blk_add_trace_split(struct r } /** - * blk_add_trace_remap - Add a trace for a remap operation + * blk_add_trace_bio_remap - Add a trace for a bio-remap operation * @q: queue the io is for * @bio: the source bio * @dev: target device @@ -833,8 +833,8 @@ static void blk_add_trace_split(struct r * it spans a stripe (or similar). Add a trace for that action. * **/ -static void blk_add_trace_remap(struct request_queue *q, struct bio *bio, - dev_t dev, sector_t from) +static void blk_add_trace_bio_remap(struct request_queue *q, struct bio *bio, + dev_t dev, sector_t from) { struct blk_trace *bt = q->blk_trace; struct blk_io_trace_remap r; @@ -947,7 +947,7 @@ static void blk_register_tracepoints(voi WARN_ON(ret); ret = register_trace_block_split(blk_add_trace_split); WARN_ON(ret); - ret = register_trace_block_remap(blk_add_trace_remap); + ret = register_trace_block_bio_remap(blk_add_trace_bio_remap); WARN_ON(ret); ret = register_trace_block_rq_remap(blk_add_trace_rq_remap); WARN_ON(ret); @@ -956,7 +956,7 @@ static void blk_register_tracepoints(voi static void blk_unregister_tracepoints(void) { unregister_trace_block_rq_remap(blk_add_trace_rq_remap); - unregister_trace_block_remap(blk_add_trace_remap); + unregister_trace_block_bio_remap(blk_add_trace_bio_remap); unregister_trace_block_split(blk_add_trace_split); unregister_trace_block_unplug_io(blk_add_trace_unplug_io); unregister_trace_block_unplug_timer(blk_add_trace_unplug_timer); Index: linux-2.6.31.work/drivers/md/dm.c =================================================================== --- linux-2.6.31.work.orig/drivers/md/dm.c +++ linux-2.6.31.work/drivers/md/dm.c @@ -961,8 +961,8 @@ static void __map_bio(struct dm_target * if (r == DM_MAPIO_REMAPPED) { /* the bio has been remapped so dispatch it */ - trace_block_remap(bdev_get_queue(clone->bi_bdev), clone, - tio->io->bio->bi_bdev->bd_dev, sector); + trace_block_bio_remap(bdev_get_queue(clone->bi_bdev), clone, + tio->io->bio->bi_bdev->bd_dev, sector); generic_make_request(clone); } else if (r < 0 || r == DM_MAPIO_REQUEUE) {