From: Eric Sandeen <sandeen@sandeen.net>
To: xfs@oss.sgi.com
Subject: Re: [PATCH] libxfs: fix up mismerge in libxfs_iflush_int
Date: Thu, 18 Feb 2016 16:58:51 -0600 [thread overview]
Message-ID: <56C64CAB.8020607@sandeen.net> (raw)
In-Reply-To: <56C62FC1.60205@redhat.com>
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
next prev parent reply other threads:[~2016-02-18 22:59 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-18 20:55 [PATCH] libxfs: fix up mismerge in libxfs_iflush_int Eric Sandeen
2016-02-18 22:58 ` Eric Sandeen [this message]
2016-02-22 9:03 ` Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=56C64CAB.8020607@sandeen.net \
--to=sandeen@sandeen.net \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox