* [PATCH] libxfs: fix up mismerge in libxfs_iflush_int
@ 2016-02-18 20:55 Eric Sandeen
2016-02-18 22:58 ` Eric Sandeen
2016-02-22 9:03 ` Christoph Hellwig
0 siblings, 2 replies; 3+ messages in thread
From: Eric Sandeen @ 2016-02-18 20:55 UTC (permalink / raw)
To: xfs
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>
---
diff --git a/libxfs/util.c b/libxfs/util.c
index 576f954..f3b9895 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) );
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] libxfs: fix up mismerge in libxfs_iflush_int
2016-02-18 20:55 [PATCH] libxfs: fix up mismerge in libxfs_iflush_int Eric Sandeen
@ 2016-02-18 22:58 ` Eric Sandeen
2016-02-22 9:03 ` Christoph Hellwig
1 sibling, 0 replies; 3+ messages in thread
From: Eric Sandeen @ 2016-02-18 22:58 UTC (permalink / raw)
To: xfs
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
On 2/18/16 2:55 PM, Eric Sandeen wrote:
> 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>
> ---
>
> diff --git a/libxfs/util.c b/libxfs/util.c
> index 576f954..f3b9895 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) );
>
> _______________________________________________
> xfs mailing list
> xfs@oss.sgi.com
> http://oss.sgi.com/mailman/listinfo/xfs
>
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] libxfs: fix up mismerge in libxfs_iflush_int
2016-02-18 20:55 [PATCH] libxfs: fix up mismerge in libxfs_iflush_int Eric Sandeen
2016-02-18 22:58 ` Eric Sandeen
@ 2016-02-22 9:03 ` Christoph Hellwig
1 sibling, 0 replies; 3+ messages in thread
From: Christoph Hellwig @ 2016-02-22 9:03 UTC (permalink / raw)
To: Eric Sandeen; +Cc: xfs
Ooops. Looks fine:
Reviewed-by: Christoph Hellwig <hch@lst.de>
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-02-22 9:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-18 20:55 [PATCH] libxfs: fix up mismerge in libxfs_iflush_int Eric Sandeen
2016-02-18 22:58 ` Eric Sandeen
2016-02-22 9:03 ` Christoph Hellwig
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox