From ff0f39eadb85f3eb0110184bf6d64e43a2ed7f3d Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Mon, 29 Feb 2016 16:03:06 +1100 Subject: [PATCH] libxfs: fix up mismerge in libxfs_iflush_int XFS_ISDIR is a bool, don't compare it to S_IFDIR e37bf5 xfs: mode di_mode to vfs inode had a small mis-merge from kernelspace, when moving from if ((ip->i_d.di_mode & S_IFMT) == S_IFDIR) to if (XFS_ISDIR(ip) == S_IFDIR that "==" should have been dropped. Signed-off-by: ERic Sandeen Reviewed-by: Christoph Hellwig Signed-off-by: Dave Chinner --- libxfs/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libxfs/util.c b/libxfs/util.c index 576f9543d..f3b989543 100644 --- a/libxfs/util.c +++ b/libxfs/util.c @@ -420,7 +420,7 @@ libxfs_iflush_int(xfs_inode_t *ip, xfs_buf_t *bp) if (XFS_ISREG(ip)) { ASSERT( (ip->i_d.di_format == XFS_DINODE_FMT_EXTENTS) || (ip->i_d.di_format == XFS_DINODE_FMT_BTREE) ); - } else if (XFS_ISDIR(ip) == S_IFDIR) { + } else if (XFS_ISDIR(ip)) { ASSERT( (ip->i_d.di_format == XFS_DINODE_FMT_EXTENTS) || (ip->i_d.di_format == XFS_DINODE_FMT_BTREE) || (ip->i_d.di_format == XFS_DINODE_FMT_LOCAL) ); -- 2.47.2