From: Eric Sandeen <sandeen@redhat.com>
Date: Mon, 29 Feb 2016 05:03:06 +0000 (+1100)
Subject: libxfs: fix up mismerge in libxfs_iflush_int
X-Git-Tag: v4.7.0-rc1~64^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ff0f39eadb85f3eb0110184bf6d64e43a2ed7f3d;p=thirdparty%2Fxfsprogs-dev.git

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 <sandeen@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dave Chinner <david@fromorbit.com>
---

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) );