openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

xfs: remove the XFS_DFORK_Q macro 

Just checking di_forkoff directly is a little easier to follow.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Chandan Babu R <chandanrlinux@gmail.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
This commit is contained in:
Christoph Hellwig 2020-05-18 10:27:21 -07:00 committed by Darrick J. Wong
parent 5fd68bdb5a
commit 09c38edd54
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fs/xfs/libxfs/xfs_format.h
View File

@ -964,13 +964,12 @@ enum xfs_dinode_fmt {
/* /*
* Inode data & attribute fork sizes, per inode. * 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_BOFF(dip) ((int)((dip)->di_forkoff << 3))
#define XFS_DFORK_DSIZE(dip,mp) \ #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) \ #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) \ #define XFS_DFORK_SIZE(dip,mp,w) \
((w) == XFS_DATA_FORK ? \ ((w) == XFS_DATA_FORK ? \
XFS_DFORK_DSIZE(dip, mp) : \ XFS_DFORK_DSIZE(dip, mp) : \

6
fs/xfs/libxfs/xfs_inode_buf.c
View File

@ -265,7 +265,7 @@ xfs_inode_from_disk(
error = xfs_iformat_data_fork(ip, from); error = xfs_iformat_data_fork(ip, from);
if (error) if (error)
return error; return error;
if (XFS_DFORK_Q(from)) { if (from->di_forkoff) {
error = xfs_iformat_attr_fork(ip, from); error = xfs_iformat_attr_fork(ip, from);
if (error) if (error)
goto out_destroy_data_fork; goto out_destroy_data_fork;
@ -435,7 +435,7 @@ xfs_dinode_verify_forkoff(
struct xfs_dinode *dip, struct xfs_dinode *dip,
struct xfs_mount *mp) struct xfs_mount *mp)
{ {
if (!XFS_DFORK_Q(dip)) if (!dip->di_forkoff)
return NULL; return NULL;
switch (dip->di_format) { switch (dip->di_format) {
@ -538,7 +538,7 @@ xfs_dinode_verify(
return __this_address; return __this_address;
} }
if (XFS_DFORK_Q(dip)) { if (dip->di_forkoff) {
fa = xfs_dinode_verify_fork(dip, mp, XFS_ATTR_FORK); fa = xfs_dinode_verify_fork(dip, mp, XFS_ATTR_FORK);
if (fa) if (fa)
return fa; return fa;