leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

blktrace: fix coding style in recent patches

Browse Source 
Impact: cleanup

Reported-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Arnaldo Carvalho de Melo 2009-02-03 11:58:29 -02:00 committed by Ingo Molnar
parent 08a06b83ff
commit 939b366977
1 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
block/blktrace.c
View File

@ -24,7 +24,7 @@
#include <linux/debugfs.h> #include <linux/debugfs.h>
#include <linux/time.h> #include <linux/time.h>
#include <trace/block.h> #include <trace/block.h>
#include <asm/uaccess.h> #include <linux/uaccess.h>
#include <../kernel/trace/trace_output.h> #include <../kernel/trace/trace_output.h>
static unsigned int blktrace_seq __read_mostly = 1; static unsigned int blktrace_seq __read_mostly = 1;
@ -148,11 +148,12 @@ static int act_log_check(struct blk_trace *bt, u32 what, sector_t sector,
/* /*
* Data direction bit lookup * Data direction bit lookup
*/ */
static u32 ddir_act[2] __read_mostly = { BLK_TC_ACT(BLK_TC_READ), BLK_TC_ACT(BLK_TC_WRITE) }; static u32 ddir_act[2] __read_mostly = { BLK_TC_ACT(BLK_TC_READ),
BLK_TC_ACT(BLK_TC_WRITE) };
/* The ilog2() calls fall out because they're constant */ /* The ilog2() calls fall out because they're constant */
#define MASK_TC_BIT(rw, __name) ( (rw & (1 << BIO_RW_ ## __name)) << \ #define MASK_TC_BIT(rw, __name) ((rw & (1 << BIO_RW_ ## __name)) << \
(ilog2(BLK_TC_ ## __name) + BLK_TC_SHIFT - BIO_RW_ ## __name) ) (ilog2(BLK_TC_ ## __name) + BLK_TC_SHIFT - BIO_RW_ ## __name))
/* /*
* The worker for the various blk_add_trace*() types. Fills out a * The worker for the various blk_add_trace*() types. Fills out a
@ -221,13 +222,13 @@ static void __blk_add_trace(struct blk_trace *bt, sector_t sector, int bytes,
t->time = ktime_to_ns(ktime_get()); t->time = ktime_to_ns(ktime_get());
record_it: record_it:
/* /*
* These two are not needed in ftrace as they are in the * These two are not needed in ftrace as they are in the
* generic trace_entry, filled by tracing_generic_entry_update, * generic trace_entry, filled by tracing_generic_entry_update,
* but for the trace_event->bin() synthesizer benefit we do it * but for the trace_event->bin() synthesizer benefit we do it
* here too. * here too.
*/ */
t->cpu = cpu; t->cpu = cpu;
t->pid = pid; t->pid = pid;
t->sector = sector; t->sector = sector;
t->bytes = bytes; t->bytes = bytes;
@ -453,7 +454,8 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
atomic_set(&bt->dropped, 0); atomic_set(&bt->dropped, 0);
ret = -EIO; ret = -EIO;
bt->dropped_file = debugfs_create_file("dropped", 0444, dir, bt, &blk_dropped_fops); bt->dropped_file = debugfs_create_file("dropped", 0444, dir, bt,
&blk_dropped_fops);
if (!bt->dropped_file) if (!bt->dropped_file)
goto err; goto err;
@ -535,10 +537,10 @@ EXPORT_SYMBOL_GPL(blk_trace_setup);
int blk_trace_startstop(struct request_queue *q, int start) int blk_trace_startstop(struct request_queue *q, int start)
{ {
struct blk_trace *bt;
int ret; int ret;
struct blk_trace *bt = q->blk_trace;
if ((bt = q->blk_trace) == NULL) if (bt == NULL)
return -EINVAL; return -EINVAL;
/* /*
@ -674,12 +676,14 @@ static void blk_add_trace_rq_issue(struct request_queue *q, struct request *rq)
blk_add_trace_rq(q, rq, BLK_TA_ISSUE); blk_add_trace_rq(q, rq, BLK_TA_ISSUE);
} }
static void blk_add_trace_rq_requeue(struct request_queue *q, struct request *rq) static void blk_add_trace_rq_requeue(struct request_queue *q,
struct request *rq)
{ {
blk_add_trace_rq(q, rq, BLK_TA_REQUEUE); blk_add_trace_rq(q, rq, BLK_TA_REQUEUE);
} }
static void blk_add_trace_rq_complete(struct request_queue *q, struct request *rq) static void blk_add_trace_rq_complete(struct request_queue *q,
struct request *rq)
{ {
blk_add_trace_rq(q, rq, BLK_TA_COMPLETE); blk_add_trace_rq(q, rq, BLK_TA_COMPLETE);
} }
@ -716,12 +720,14 @@ static void blk_add_trace_bio_complete(struct request_queue *q, struct bio *bio)
blk_add_trace_bio(q, bio, BLK_TA_COMPLETE); blk_add_trace_bio(q, bio, BLK_TA_COMPLETE);
} }
static void blk_add_trace_bio_backmerge(struct request_queue *q, struct bio *bio) static void blk_add_trace_bio_backmerge(struct request_queue *q,
struct bio *bio)
{ {
blk_add_trace_bio(q, bio, BLK_TA_BACKMERGE); blk_add_trace_bio(q, bio, BLK_TA_BACKMERGE);
} }
static void blk_add_trace_bio_frontmerge(struct request_queue *q, struct bio *bio) static void blk_add_trace_bio_frontmerge(struct request_queue *q,
struct bio *bio)
{ {
blk_add_trace_bio(q, bio, BLK_TA_FRONTMERGE); blk_add_trace_bio(q, bio, BLK_TA_FRONTMERGE);
} }
@ -731,7 +737,8 @@ static void blk_add_trace_bio_queue(struct request_queue *q, struct bio *bio)
blk_add_trace_bio(q, bio, BLK_TA_QUEUE); blk_add_trace_bio(q, bio, BLK_TA_QUEUE);
} }
static void blk_add_trace_getrq(struct request_queue *q, struct bio *bio, int rw) static void blk_add_trace_getrq(struct request_queue *q,
struct bio *bio, int rw)
{ {
if (bio) if (bio)
blk_add_trace_bio(q, bio, BLK_TA_GETRQ); blk_add_trace_bio(q, bio, BLK_TA_GETRQ);
@ -744,7 +751,8 @@ static void blk_add_trace_getrq(struct request_queue *q, struct bio *bio, int rw
} }
static void blk_add_trace_sleeprq(struct request_queue *q, struct bio *bio, int rw) static void blk_add_trace_sleeprq(struct request_queue *q,
struct bio *bio, int rw)
{ {
if (bio) if (bio)
blk_add_trace_bio(q, bio, BLK_TA_SLEEPRQ); blk_add_trace_bio(q, bio, BLK_TA_SLEEPRQ);
@ -752,7 +760,8 @@ static void blk_add_trace_sleeprq(struct request_queue *q, struct bio *bio, int
struct blk_trace *bt = q->blk_trace; struct blk_trace *bt = q->blk_trace;
if (bt) if (bt)
__blk_add_trace(bt, 0, 0, rw, BLK_TA_SLEEPRQ, 0, 0, NULL); __blk_add_trace(bt, 0, 0, rw, BLK_TA_SLEEPRQ,
0, 0, NULL);
} }
} }