From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ipmail07.adl2.internode.on.net ([150.101.137.131]:12575 "EHLO ipmail07.adl2.internode.on.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752445AbcFUAxj (ORCPT ); Mon, 20 Jun 2016 20:53:39 -0400 Date: Tue, 21 Jun 2016 10:47:32 +1000 From: Dave Chinner To: Christoph Hellwig Cc: "Darrick J. Wong" , linux-fsdevel@vger.kernel.org, vishal.l.verma@intel.com, xfs@oss.sgi.com Subject: Re: [PATCH 004/119] xfs: enable buffer deadlock postmortem diagnosis via ftrace Message-ID: <20160621004731.GL26977@dastard> References: <146612627129.12839.3827886950949809165.stgit@birch.djwong.org> <146612629822.12839.7938642541078923297.stgit@birch.djwong.org> <20160617113423.GC19042@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20160617113423.GC19042@infradead.org> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: On Fri, Jun 17, 2016 at 04:34:23AM -0700, Christoph Hellwig wrote: > > diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c > > index efa2a73..2333db7 100644 > > --- a/fs/xfs/xfs_buf.c > > +++ b/fs/xfs/xfs_buf.c > > @@ -947,7 +947,8 @@ xfs_buf_trylock( > > if (locked) > > XB_SET_OWNER(bp); > > > > - trace_xfs_buf_trylock(bp, _RET_IP_); > > + locked ? trace_xfs_buf_trylock(bp, _RET_IP_) : > > + trace_xfs_buf_trylock_fail(bp, _RET_IP_); > > return locked; > > I think this should be something like: > > if (locked) { > XB_SET_OWNER(bp); > trace_xfs_buf_trylock(bp, _RET_IP_); > } else { > trace_xfs_buf_trylock_fail(bp, _RET_IP_); > } > > otherwise this looks good and can go in without the rest of the series. I'll fix that up on commit. Cheers, Dave. -- Dave Chinner david@fromorbit.com