Commit 0a82a8d1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Revert "block: add missing block_bio_complete() tracepoint" 



This reverts commit 3a366e61.

Wanlong Gao reports that it causes a kernel panic on his machine several
minutes after boot. Reverting it removes the panic.

Jens says:
 "It's not quite clear why that is yet, so I think we should just revert
  the commit for 3.9 final (which I'm assuming is pretty close).

  The wifi is crap at the LSF hotel, so sending this email instead of
  queueing up a revert and pull request."

Reported-by: default avatarWanlong Gao <gaowanlong@cn.fujitsu.com>
Requested-by: default avatarJens Axboe <axboe@kernel.dk>
Cc: Tejun Heo <tj@kernel.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5c51543b

block/blk-core.c

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 


EXPORT_TRACEPOINT_SYMBOL_GPL(block_bio_remap);

EXPORT_TRACEPOINT_SYMBOL_GPL(block_rq_remap);

EXPORT_TRACEPOINT_SYMBOL_GPL(block_bio_complete);

EXPORT_TRACEPOINT_SYMBOL_GPL(block_unplug);



DEFINE_IDA(blk_queue_ida);

drivers/md/dm.c

+1 −0
Original line number Diff line number Diff line
@@ -611,6 +611,7 @@ static void dec_pending(struct dm_io *io, int error) 
			queue_io(md, bio);

		} else {

			/* done with normal IO or empty flush */

			trace_block_bio_complete(md->queue, bio, io_error);

			bio_endio(bio, io_error);

		}

	}

drivers/md/raid5.c

+10 −1
Original line number Diff line number Diff line
@@ -184,6 +184,8 @@ static void return_io(struct bio *return_bi) 
		return_bi = bi->bi_next;

		bi->bi_next = NULL;

		bi->bi_size = 0;

		trace_block_bio_complete(bdev_get_queue(bi->bi_bdev),

					 bi, 0);

		bio_endio(bi, 0);

		bi = return_bi;

	}
@@ -3914,6 +3916,8 @@ static void raid5_align_endio(struct bio *bi, int error) 
	rdev_dec_pending(rdev, conf->mddev);



	if (!error && uptodate) {

		trace_block_bio_complete(bdev_get_queue(raid_bi->bi_bdev),

					 raid_bi, 0);

		bio_endio(raid_bi, 0);

		if (atomic_dec_and_test(&conf->active_aligned_reads))

			wake_up(&conf->wait_for_stripe);
@@ -4382,6 +4386,8 @@ static void make_request(struct mddev *mddev, struct bio * bi) 
		if ( rw == WRITE )

			md_write_end(mddev);



		trace_block_bio_complete(bdev_get_queue(bi->bi_bdev),

					 bi, 0);

		bio_endio(bi, 0);

	}

}
@@ -4758,8 +4764,11 @@ static int retry_aligned_read(struct r5conf *conf, struct bio *raid_bio) 
		handled++;

	}

	remaining = raid5_dec_bi_active_stripes(raid_bio);

	if (remaining == 0)

	if (remaining == 0) {

		trace_block_bio_complete(bdev_get_queue(raid_bio->bi_bdev),

					 raid_bio, 0);

		bio_endio(raid_bio, 0);

	}

	if (atomic_dec_and_test(&conf->active_aligned_reads))

		wake_up(&conf->wait_for_stripe);

	return handled;

fs/bio.c

+0 −2
Original line number Diff line number Diff line
@@ -1428,8 +1428,6 @@ void bio_endio(struct bio *bio, int error) 
	else if (!test_bit(BIO_UPTODATE, &bio->bi_flags))

		error = -EIO;



	trace_block_bio_complete(bio, error);



	if (bio->bi_end_io)

		bio->bi_end_io(bio, error);

}

include/linux/blktrace_api.h

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 


struct blk_trace {

	int trace_state;

	bool rq_based;

	struct rchan *rchan;

	unsigned long __percpu *sequence;

	unsigned char __percpu *msg_data;

CRA Git | Maintained and supported by SUSTech CRA and CCSE