From: Christoph Hellwig Date: Mon, 10 Aug 2020 20:32:06 +0000 (-0400) Subject: xfs: remove the XFS_DFORK_Q macro X-Git-Tag: v5.8.0-rc0~7 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=8c6cccd72823157c958110d53764022af3cb5a37;p=thirdparty%2Fxfsprogs-dev.git xfs: remove the XFS_DFORK_Q macro Source kernel commit: 09c38edd54c16657093a73a3169342f9f9080bb3 Just checking di_forkoff directly is a little easier to follow. Signed-off-by: Christoph Hellwig Reviewed-by: Brian Foster Reviewed-by: Chandan Babu R Reviewed-by: Darrick J. Wong Signed-off-by: Darrick J. Wong Signed-off-by: Eric Sandeen --- diff --git a/db/block.c b/db/block.c index d630a9651..f31f9544c 100644 --- a/db/block.c +++ b/db/block.c @@ -55,15 +55,16 @@ ablock_help(void) /*ARGSUSED*/ static int ablock_f( - int argc, - char **argv) + int argc, + char **argv) { - bmap_ext_t bm; - xfs_fileoff_t bno; - xfs_fsblock_t dfsbno; - int haveattr; - int nex; - char *p; + bmap_ext_t bm; + xfs_fileoff_t bno; + xfs_fsblock_t dfsbno; + int haveattr; + int nex; + char *p; + struct xfs_dinode *dip = iocur_top->data; bno = (xfs_fileoff_t)strtoull(argv[1], &p, 0); if (*p != '\0') { @@ -72,12 +73,12 @@ ablock_f( } push_cur(); set_cur_inode(iocur_top->ino); - if (!iocur_top->data) { + if (!dip) { pop_cur(); dbprintf(_("no current inode\n")); return 0; } - haveattr = XFS_DFORK_Q((xfs_dinode_t *)iocur_top->data); + haveattr = dip->di_forkoff; pop_cur(); if (!haveattr) { dbprintf(_("no attribute data for file\n")); diff --git a/db/bmroot.c b/db/bmroot.c index 0db526c64..f859ac3cb 100644 --- a/db/bmroot.c +++ b/db/bmroot.c @@ -67,7 +67,7 @@ bmroota_key_count( ASSERT(bitoffs(startoff) == 0); ASSERT(obj == iocur_top->data); block = (xfs_bmdr_block_t *)((char *)obj + byteize(startoff)); - ASSERT(XFS_DFORK_Q(dip) && (char *)block == XFS_DFORK_APTR(dip)); + ASSERT(dip->di_forkoff != 0 && (char *)block == XFS_DFORK_APTR(dip)); ASSERT(be16_to_cpu(block->bb_level) > 0); return be16_to_cpu(block->bb_numrecs); } @@ -87,7 +87,7 @@ bmroota_key_offset( ASSERT(bitoffs(startoff) == 0); ASSERT(obj == iocur_top->data); block = (xfs_bmdr_block_t *)((char *)obj + byteize(startoff)); - ASSERT(XFS_DFORK_Q(dip) && (char *)block == XFS_DFORK_APTR(dip)); + ASSERT(dip->di_forkoff != 0 && (char *)block == XFS_DFORK_APTR(dip)); ASSERT(be16_to_cpu(block->bb_level) > 0); kp = XFS_BMDR_KEY_ADDR(block, idx); return bitize((int)((char *)kp - (char *)block)); @@ -106,7 +106,7 @@ bmroota_ptr_count( ASSERT(bitoffs(startoff) == 0); ASSERT(obj == iocur_top->data); block = (xfs_bmdr_block_t *)((char *)obj + byteize(startoff)); - ASSERT(XFS_DFORK_Q(dip) && (char *)block == XFS_DFORK_APTR(dip)); + ASSERT(dip->di_forkoff != 0 && (char *)block == XFS_DFORK_APTR(dip)); ASSERT(be16_to_cpu(block->bb_level) > 0); return be16_to_cpu(block->bb_numrecs); } @@ -125,7 +125,7 @@ bmroota_ptr_offset( ASSERT(obj == iocur_top->data); dip = obj; block = (xfs_bmdr_block_t *)((char *)obj + byteize(startoff)); - ASSERT(XFS_DFORK_Q(dip) && (char *)block == XFS_DFORK_APTR(dip)); + ASSERT(dip->di_forkoff != 0 && (char *)block == XFS_DFORK_APTR(dip)); ASSERT(be16_to_cpu(block->bb_level) > 0); pp = XFS_BMDR_PTR_ADDR(block, idx, libxfs_bmdr_maxrecs(XFS_DFORK_ASIZE(dip, mp), 0)); @@ -149,7 +149,7 @@ bmroota_size( dip = obj; #ifdef DEBUG block = (xfs_bmdr_block_t *)((char *)obj + byteize(startoff)); - ASSERT(XFS_DFORK_Q(dip) && (char *)block == XFS_DFORK_APTR(dip)); + ASSERT(dip->di_forkoff != 0 && (char *)block == XFS_DFORK_APTR(dip)); #endif return bitize((int)XFS_DFORK_ASIZE(dip, mp)); } diff --git a/db/check.c b/db/check.c index 96abea215..c2233a0d1 100644 --- a/db/check.c +++ b/db/check.c @@ -2918,7 +2918,7 @@ process_inode( &nextents, &blkmap, XFS_DATA_FORK); break; } - if (XFS_DFORK_Q(dip)) { + if (dip->di_forkoff) { sbversion |= XFS_SB_VERSION_ATTRBIT; switch (dip->di_aformat) { case XFS_DINODE_FMT_LOCAL: diff --git a/db/frag.c b/db/frag.c index 1cfc6c2c2..cc00672ed 100644 --- a/db/frag.c +++ b/db/frag.c @@ -335,7 +335,7 @@ process_inode( ideal = extcount_ideal; if (!skipd) process_fork(dip, XFS_DATA_FORK); - skipa = !aflag || !XFS_DFORK_Q(dip); + skipa = !aflag || !dip->di_forkoff; if (!skipa) process_fork(dip, XFS_ATTR_FORK); if (vflag && (!skipd || !skipa)) diff --git a/db/inode.c b/db/inode.c index 0cff9d634..3ae5d18f9 100644 --- a/db/inode.c +++ b/db/inode.c @@ -251,7 +251,7 @@ inode_a_bmbt_count( ASSERT(bitoffs(startoff) == 0); ASSERT(obj == iocur_top->data); dip = obj; - if (!XFS_DFORK_Q(dip)) + if (!dip->di_forkoff) return 0; ASSERT((char *)XFS_DFORK_APTR(dip) - (char *)dip == byteize(startoff)); return dip->di_aformat == XFS_DINODE_FMT_BTREE; @@ -267,7 +267,7 @@ inode_a_bmx_count( ASSERT(bitoffs(startoff) == 0); ASSERT(obj == iocur_top->data); dip = obj; - if (!XFS_DFORK_Q(dip)) + if (!dip->di_forkoff) return 0; ASSERT((char *)XFS_DFORK_APTR(dip) - (char *)dip == byteize(startoff)); return dip->di_aformat == XFS_DINODE_FMT_EXTENTS ? @@ -283,7 +283,7 @@ inode_a_count( ASSERT(startoff == 0); dip = obj; - return XFS_DFORK_Q(dip); + return dip->di_forkoff; } static int @@ -297,7 +297,7 @@ inode_a_offset( ASSERT(startoff == 0); ASSERT(idx == 0); dip = obj; - ASSERT(XFS_DFORK_Q(dip)); + ASSERT(dip->di_forkoff != 0); return bitize((int)((char *)XFS_DFORK_APTR(dip) - (char *)dip)); } @@ -311,7 +311,7 @@ inode_a_sfattr_count( ASSERT(bitoffs(startoff) == 0); ASSERT(obj == iocur_top->data); dip = obj; - if (!XFS_DFORK_Q(dip)) + if (!dip->di_forkoff) return 0; ASSERT((char *)XFS_DFORK_APTR(dip) - (char *)dip == byteize(startoff)); return dip->di_aformat == XFS_DINODE_FMT_LOCAL; diff --git a/libxfs/xfs_format.h b/libxfs/xfs_format.h index 9a20debfd..3ccaf0a8c 100644 --- a/libxfs/xfs_format.h +++ b/libxfs/xfs_format.h @@ -964,13 +964,12 @@ enum xfs_dinode_fmt { /* * Inode data & attribute fork sizes, per inode. */ -#define XFS_DFORK_Q(dip) ((dip)->di_forkoff != 0) #define XFS_DFORK_BOFF(dip) ((int)((dip)->di_forkoff << 3)) #define XFS_DFORK_DSIZE(dip,mp) \ - (XFS_DFORK_Q(dip) ? XFS_DFORK_BOFF(dip) : XFS_LITINO(mp)) + ((dip)->di_forkoff ? XFS_DFORK_BOFF(dip) : XFS_LITINO(mp)) #define XFS_DFORK_ASIZE(dip,mp) \ - (XFS_DFORK_Q(dip) ? XFS_LITINO(mp) - XFS_DFORK_BOFF(dip) : 0) + ((dip)->di_forkoff ? XFS_LITINO(mp) - XFS_DFORK_BOFF(dip) : 0) #define XFS_DFORK_SIZE(dip,mp,w) \ ((w) == XFS_DATA_FORK ? \ XFS_DFORK_DSIZE(dip, mp) : \ diff --git a/libxfs/xfs_inode_buf.c b/libxfs/xfs_inode_buf.c index f7742915e..41345a214 100644 --- a/libxfs/xfs_inode_buf.c +++ b/libxfs/xfs_inode_buf.c @@ -262,7 +262,7 @@ xfs_inode_from_disk( error = xfs_iformat_data_fork(ip, from); if (error) return error; - if (XFS_DFORK_Q(from)) { + if (from->di_forkoff) { error = xfs_iformat_attr_fork(ip, from); if (error) goto out_destroy_data_fork; @@ -432,7 +432,7 @@ xfs_dinode_verify_forkoff( struct xfs_dinode *dip, struct xfs_mount *mp) { - if (!XFS_DFORK_Q(dip)) + if (!dip->di_forkoff) return NULL; switch (dip->di_format) { @@ -535,7 +535,7 @@ xfs_dinode_verify( return __this_address; } - if (XFS_DFORK_Q(dip)) { + if (dip->di_forkoff) { fa = xfs_dinode_verify_fork(dip, mp, XFS_ATTR_FORK); if (fa) return fa; diff --git a/repair/dinode.c b/repair/dinode.c index 526ecde3f..d552db2d5 100644 --- a/repair/dinode.c +++ b/repair/dinode.c @@ -1939,7 +1939,7 @@ process_inode_attr_fork( int repair = 0; int err; - if (!XFS_DFORK_Q(dino)) { + if (!dino->di_forkoff) { *anextents = 0; if (dino->di_aformat != XFS_DINODE_FMT_EXTENTS) { do_warn(_("bad attribute format %d in inode %" PRIu64 ", "),