aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLi Zefan <lizf@cn.fujitsu.com>2009-03-24 04:04:37 -0400
committerIngo Molnar <mingo@elte.hu>2009-03-24 08:08:59 -0400
commite4955c9986a27bb47ddeb6cd55803053f547e2e9 (patch)
treee0dc65874b6d403d4379fd57c73a05ace516067c
parentb125130b22d67f249beba10b71a254558b5279d0 (diff)
blktrace: mark ddir_act[] const
Impact: cleanup ddir_act and what2act always stay immutable. Signed-off-by: Li Zefan <lizf@cn.fujitsu.com> Acked-by: Jens Axboe <jens.axboe@oracle.com> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Arnaldo Carvalho de Melo <acme@redhat.com> LKML-Reference: <49C89415.5080503@cn.fujitsu.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--kernel/trace/blktrace.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index 108f4f7715a5..1ffcbd4ac45b 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -147,8 +147,8 @@ static int act_log_check(struct blk_trace *bt, u32 what, sector_t sector,
147/* 147/*
148 * Data direction bit lookup 148 * Data direction bit lookup
149 */ 149 */
150static u32 ddir_act[2] __read_mostly = { BLK_TC_ACT(BLK_TC_READ), 150static const u32 ddir_act[2] = { BLK_TC_ACT(BLK_TC_READ),
151 BLK_TC_ACT(BLK_TC_WRITE) }; 151 BLK_TC_ACT(BLK_TC_WRITE) };
152 152
153/* The ilog2() calls fall out because they're constant */ 153/* The ilog2() calls fall out because they're constant */
154#define MASK_TC_BIT(rw, __name) ((rw & (1 << BIO_RW_ ## __name)) << \ 154#define MASK_TC_BIT(rw, __name) ((rw & (1 << BIO_RW_ ## __name)) << \
@@ -1116,10 +1116,10 @@ static void blk_tracer_reset(struct trace_array *tr)
1116 blk_tracer_stop(tr); 1116 blk_tracer_stop(tr);
1117} 1117}
1118 1118
1119static struct { 1119static const struct {
1120 const char *act[2]; 1120 const char *act[2];
1121 int (*print)(struct trace_seq *s, const struct trace_entry *ent); 1121 int (*print)(struct trace_seq *s, const struct trace_entry *ent);
1122} what2act[] __read_mostly = { 1122} what2act[] = {
1123 [__BLK_TA_QUEUE] = {{ "Q", "queue" }, blk_log_generic }, 1123 [__BLK_TA_QUEUE] = {{ "Q", "queue" }, blk_log_generic },
1124 [__BLK_TA_BACKMERGE] = {{ "M", "backmerge" }, blk_log_generic }, 1124 [__BLK_TA_BACKMERGE] = {{ "M", "backmerge" }, blk_log_generic },
1125 [__BLK_TA_FRONTMERGE] = {{ "F", "frontmerge" }, blk_log_generic }, 1125 [__BLK_TA_FRONTMERGE] = {{ "F", "frontmerge" }, blk_log_generic },