From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754861Ab1AGRlO (ORCPT ); Fri, 7 Jan 2011 12:41:14 -0500 Received: from mail.openrapids.net ([64.15.138.104]:59068 "EHLO blackscsi.openrapids.net" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754396Ab1AGRlN (ORCPT ); Fri, 7 Jan 2011 12:41:13 -0500 Date: Fri, 7 Jan 2011 12:41:10 -0500 From: Mathieu Desnoyers To: Jens Axboe Cc: Jeff Moyer , Steven Rostedt , Frederic Weisbecker , Ingo Molnar , Thomas Gleixner , Li Zefan , linux-kernel@vger.kernel.org Subject: Re: [PATCH] blktrace: add missing probe argument to block_bio_complete Message-ID: <20110107174110.GA23082@Krystal> References: <20110107015453.GB5109@Krystal> <4D272EBA.5000703@kernel.dk> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4D272EBA.5000703@kernel.dk> X-Editor: vi X-Info: http://www.efficios.com X-Operating-System: Linux/2.6.26-2-686 (i686) X-Uptime: 12:21:15 up 44 days, 22:24, 6 users, load average: 0.00, 0.02, 0.00 User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org * Jens Axboe (axboe@kernel.dk) wrote: > On 2011-01-07 15:13, Jeff Moyer wrote: > > Mathieu Desnoyers writes: > > > >> blktrace.c block bio complete callback needs to gain a new argument to reflect > >> the newly added "error" tracepoint argument. This is needed to match the new > >> block_bio_complete TRACE_EVENT as of > >> commit de983a7bfcb7c020901ca6e2314cf55a4207ab5a. > >> > >> Signed-off-by: Mathieu Desnoyers > >> CC: Jeff Moyer > >> CC: Steven Rostedt > >> CC: Frederic Weisbecker > >> CC: Ingo Molnar > >> CC: Thomas Gleixner > >> CC: Jens Axboe > >> CC: Li Zefan > >> --- > >> kernel/trace/blktrace.c | 3 ++- > >> 1 file changed, 2 insertions(+), 1 deletion(-) > >> > >> Index: linux-2.6-lttng/kernel/trace/blktrace.c > >> =================================================================== > >> --- linux-2.6-lttng.orig/kernel/trace/blktrace.c > >> +++ linux-2.6-lttng/kernel/trace/blktrace.c > >> @@ -785,7 +785,8 @@ static void blk_add_trace_bio_bounce(voi > >> } > >> > >> static void blk_add_trace_bio_complete(void *ignore, > >> - struct request_queue *q, struct bio *bio) > >> + struct request_queue *q, struct bio *bio, > >> + int error) > >> { > >> blk_add_trace_bio(q, bio, BLK_TA_COMPLETE); > >> } > > > > OK, I clearly didn't look closely enough last time. There's no sense > > passing this information down if it isn't used (as you said initially). > > blk_add_trace_bio sets the error based on whether or not the > > BIO_UPTODATE bit is set. So, I think we should instead revert the patch > > I sent you (Mathieu), and then completely get rid of the error field in > > the TP macros. > > > > Does that make sense to everyone else? > > We usually use BIO_UPTODATE if we have no other information available. > So if we have, then we should use it. Good point. I tested your patch below applied after "trace event block fix unassigned field", and it builds fine. Please feel free to add my Acked-by: Mathieu Desnoyers Are you planning to apply it on top of "blktrace: add missing probe argument to block_bio_complete" ? (which I see you have merged in block for-next) Thanks, Mathieu -- Mathieu Desnoyers Operating System Efficiency R&D Consultant EfficiOS Inc. http://www.efficios.com