Commit 63fbb4c1 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: remove the ISUNWRITTEN macro 



Opencoding the trivial checks makes it much easier to read (and grep..).

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent 9c4f29d3

fs/xfs/libxfs/xfs_bmap_btree.h

+0 −1
Original line number Diff line number Diff line
@@ -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.

fs/xfs/xfs_aops.c

+2 −2
Original line number Diff line number Diff line
@@ -1261,8 +1261,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);

fs/xfs/xfs_iomap.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

		}
@@ -945,7 +945,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)

CRA Git | Maintained and supported by SUSTech CRA and CCSE