From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from userp1050.oracle.com ([156.151.31.82]:37596 "EHLO userp1050.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751323AbdB1Fa6 (ORCPT ); Tue, 28 Feb 2017 00:30:58 -0500 Received: from userp1040.oracle.com (userp1040.oracle.com [156.151.31.81]) by userp1050.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id v1S5UPQ3011857 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 28 Feb 2017 05:30:25 GMT Date: Mon, 27 Feb 2017 21:28:30 -0800 From: "Darrick J. Wong" Subject: Re: [PATCH 2/2] xfs: remove the ISUNWRITTEN macro Message-ID: <20170228052830.GF5297@birch.djwong.org> References: <20170228004930.9559-1-hch@lst.de> <20170228004930.9559-2-hch@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170228004930.9559-2-hch@lst.de> Sender: linux-xfs-owner@vger.kernel.org List-ID: List-Id: xfs To: Christoph Hellwig Cc: linux-xfs@vger.kernel.org On Mon, Feb 27, 2017 at 04:49:30PM -0800, Christoph Hellwig wrote: > Opencoding the trivial checks makes it much easier to read (and grep..). > > Signed-off-by: Christoph Hellwig Reviewed-by: Darrick J. Wong --D > --- > fs/xfs/libxfs/xfs_bmap_btree.h | 1 - > fs/xfs/xfs_aops.c | 4 ++-- > fs/xfs/xfs_iomap.c | 4 ++-- > 3 files changed, 4 insertions(+), 5 deletions(-) > > diff --git a/fs/xfs/libxfs/xfs_bmap_btree.h b/fs/xfs/libxfs/xfs_bmap_btree.h > index 819a8a4dee95..90347a99c6d2 100644 > --- a/fs/xfs/libxfs/xfs_bmap_btree.h > +++ b/fs/xfs/libxfs/xfs_bmap_btree.h > @@ -30,7 +30,6 @@ struct xfs_trans; > #define XFS_EXTFMT_INODE(x) \ > (xfs_sb_version_hasextflgbit(&((x)->i_mount->m_sb)) ? \ > XFS_EXTFMT_HASSTATE : XFS_EXTFMT_NOSTATE) > -#define ISUNWRITTEN(x) ((x)->br_state == XFS_EXT_UNWRITTEN) > > /* > * Btree block header size depends on a superblock flag. > diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c > index 582e3275bb51..b480647e00e7 100644 > --- a/fs/xfs/xfs_aops.c > +++ b/fs/xfs/xfs_aops.c > @@ -1266,8 +1266,8 @@ xfs_get_blocks( > > if (nimaps) { > trace_xfs_get_blocks_found(ip, offset, size, > - ISUNWRITTEN(&imap) ? XFS_IO_UNWRITTEN > - : XFS_IO_OVERWRITE, &imap); > + imap.br_state == XFS_EXT_UNWRITTEN ? > + XFS_IO_UNWRITTEN : XFS_IO_OVERWRITE, &imap); > xfs_iunlock(ip, lockmode); > } else { > trace_xfs_get_blocks_notfound(ip, offset, size); > diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c > index 41662fb14e87..5d68b4279016 100644 > --- a/fs/xfs/xfs_iomap.c > +++ b/fs/xfs/xfs_iomap.c > @@ -240,7 +240,7 @@ xfs_iomap_write_direct( > */ > if (IS_DAX(VFS_I(ip))) { > bmapi_flags = XFS_BMAPI_CONVERT | XFS_BMAPI_ZERO; > - if (ISUNWRITTEN(imap)) { > + if (imap->br_state == XFS_EXT_UNWRITTEN) { > tflags |= XFS_TRANS_RESERVE; > resblks = XFS_DIOSTRAT_SPACE_RES(mp, 0) << 1; > } > @@ -940,7 +940,7 @@ static inline bool imap_needs_alloc(struct inode *inode, > return !nimaps || > imap->br_startblock == HOLESTARTBLOCK || > imap->br_startblock == DELAYSTARTBLOCK || > - (IS_DAX(inode) && ISUNWRITTEN(imap)); > + (IS_DAX(inode) && imap->br_state == XFS_EXT_UNWRITTEN); > } > > static inline bool need_excl_ilock(struct xfs_inode *ip, unsigned flags) > -- > 2.11.0 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html