Commit 939b3669 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by Ingo Molnar
Browse files

blktrace: fix coding style in recent patches 



Impact: cleanup

Reported-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 08a06b83

block/blktrace.c

+30 −21
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include <linux/debugfs.h>

#include <linux/time.h>

#include <trace/block.h>

#include <asm/uaccess.h>

#include <linux/uaccess.h>

#include <../kernel/trace/trace_output.h>



static unsigned int blktrace_seq __read_mostly = 1;
@@ -148,7 +148,8 @@ static int act_log_check(struct blk_trace *bt, u32 what, sector_t sector, 
/*

 * 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 */

#define MASK_TC_BIT(rw, __name) ((rw & (1 << BIO_RW_ ## __name)) << \
@@ -453,7 +454,8 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev, 
	atomic_set(&bt->dropped, 0);



	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)

		goto err;
@@ -535,10 +537,10 @@ EXPORT_SYMBOL_GPL(blk_trace_setup); 


int blk_trace_startstop(struct request_queue *q, int start)

{

	struct blk_trace *bt;

	int ret;

	struct blk_trace *bt = q->blk_trace;



	if ((bt = q->blk_trace) == NULL)

	if (bt == NULL)

		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);

}



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);

}



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);

}
@@ -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);

}



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);

}



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);

}
@@ -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);

}



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)

		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)

		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;



		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);

	}

}