Skip to contentSkip to conversation

libxfs: fix up mismerge in libxfs_iflush_int

PATCH In review Eric Sandeen 3 participants 3 messages Feb 18, 2016 – Feb 22, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---

libxfs/util.c +1 -1
index 576f954..f3b9895 100644
@@ -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) );

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

#1 lore raw

Oh, if you think of it, you can note that this
is coverity ID 1353345 in the changelog as well;
not sure we care too much about that, but *shrug*

-Eric

Quoted 28 lines · Eric Sandeen

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.

---

libxfs/util.c +1 -1
index 576f954..f3b9895 100644
@@ -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) );
Quoted 5 lines

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs