* [PATCH v2] xfs: avoid harmless gcc-7 warnings
@ 2017-05-11 15:04 Arnd Bergmann
2017-05-11 15:06 ` Christoph Hellwig
2017-05-11 15:17 ` Darrick J. Wong
0 siblings, 2 replies; 3+ messages in thread
From: Arnd Bergmann @ 2017-05-11 15:04 UTC (permalink / raw)
To: Darrick J. Wong, linux-xfs
Cc: Arnd Bergmann, Brian Foster, Eric Sandeen, linux-kernel
gcc-7 flags the use of integer math inside of a condition
as a potential bug:
fs/xfs/xfs_bmap_util.c: In function 'xfs_swap_extents_check_format':
fs/xfs/xfs_bmap_util.c:1619:8: error: '<<' in boolean context, did you mean '<' ? [-Werror=int-in-bool-context]
fs/xfs/xfs_bmap_util.c:1629:8: error: '<<' in boolean context, did you mean '<' ? [-Werror=int-in-bool-context]
There is already a helper function for testing the di_forkoff
field for zero, so let's use that instead to shut up the warning.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
fs/xfs/xfs_bmap_util.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c
index 2b954308a1d6..da4867567647 100644
--- a/fs/xfs/xfs_bmap_util.c
+++ b/fs/xfs/xfs_bmap_util.c
@@ -1613,7 +1613,7 @@ xfs_swap_extents_check_format(
* extent format...
*/
if (tip->i_d.di_format == XFS_DINODE_FMT_BTREE) {
- if (XFS_IFORK_BOFF(ip) &&
+ if (XFS_IFORK_Q(ip) &&
XFS_BMAP_BMDR_SPACE(tip->i_df.if_broot) > XFS_IFORK_BOFF(ip))
return -EINVAL;
if (XFS_IFORK_NEXTENTS(tip, XFS_DATA_FORK) <=
@@ -1623,7 +1623,7 @@ xfs_swap_extents_check_format(
/* Reciprocal target->temp btree format checks */
if (ip->i_d.di_format == XFS_DINODE_FMT_BTREE) {
- if (XFS_IFORK_BOFF(tip) &&
+ if (XFS_IFORK_Q(tip) &&
XFS_BMAP_BMDR_SPACE(ip->i_df.if_broot) > XFS_IFORK_BOFF(tip))
return -EINVAL;
if (XFS_IFORK_NEXTENTS(ip, XFS_DATA_FORK) <=
--
2.9.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] xfs: avoid harmless gcc-7 warnings
2017-05-11 15:04 [PATCH v2] xfs: avoid harmless gcc-7 warnings Arnd Bergmann
@ 2017-05-11 15:06 ` Christoph Hellwig
2017-05-11 15:17 ` Darrick J. Wong
1 sibling, 0 replies; 3+ messages in thread
From: Christoph Hellwig @ 2017-05-11 15:06 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Darrick J. Wong, linux-xfs, Brian Foster, Eric Sandeen, linux-kernel
Yes, this looks much better:
Reviewed-by: Christoph Hellwig <hch@lst.de>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] xfs: avoid harmless gcc-7 warnings
2017-05-11 15:04 [PATCH v2] xfs: avoid harmless gcc-7 warnings Arnd Bergmann
2017-05-11 15:06 ` Christoph Hellwig
@ 2017-05-11 15:17 ` Darrick J. Wong
1 sibling, 0 replies; 3+ messages in thread
From: Darrick J. Wong @ 2017-05-11 15:17 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: linux-xfs, Brian Foster, Eric Sandeen, linux-kernel
On Thu, May 11, 2017 at 05:04:33PM +0200, Arnd Bergmann wrote:
> gcc-7 flags the use of integer math inside of a condition
> as a potential bug:
>
> fs/xfs/xfs_bmap_util.c: In function 'xfs_swap_extents_check_format':
> fs/xfs/xfs_bmap_util.c:1619:8: error: '<<' in boolean context, did you mean '<' ? [-Werror=int-in-bool-context]
> fs/xfs/xfs_bmap_util.c:1629:8: error: '<<' in boolean context, did you mean '<' ? [-Werror=int-in-bool-context]
>
> There is already a helper function for testing the di_forkoff
> field for zero, so let's use that instead to shut up the warning.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
--D
> ---
> fs/xfs/xfs_bmap_util.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c
> index 2b954308a1d6..da4867567647 100644
> --- a/fs/xfs/xfs_bmap_util.c
> +++ b/fs/xfs/xfs_bmap_util.c
> @@ -1613,7 +1613,7 @@ xfs_swap_extents_check_format(
> * extent format...
> */
> if (tip->i_d.di_format == XFS_DINODE_FMT_BTREE) {
> - if (XFS_IFORK_BOFF(ip) &&
> + if (XFS_IFORK_Q(ip) &&
> XFS_BMAP_BMDR_SPACE(tip->i_df.if_broot) > XFS_IFORK_BOFF(ip))
> return -EINVAL;
> if (XFS_IFORK_NEXTENTS(tip, XFS_DATA_FORK) <=
> @@ -1623,7 +1623,7 @@ xfs_swap_extents_check_format(
>
> /* Reciprocal target->temp btree format checks */
> if (ip->i_d.di_format == XFS_DINODE_FMT_BTREE) {
> - if (XFS_IFORK_BOFF(tip) &&
> + if (XFS_IFORK_Q(tip) &&
> XFS_BMAP_BMDR_SPACE(ip->i_df.if_broot) > XFS_IFORK_BOFF(tip))
> return -EINVAL;
> if (XFS_IFORK_NEXTENTS(ip, XFS_DATA_FORK) <=
> --
> 2.9.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-05-11 15:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-11 15:04 [PATCH v2] xfs: avoid harmless gcc-7 warnings Arnd Bergmann
2017-05-11 15:06 ` Christoph Hellwig
2017-05-11 15:17 ` Darrick J. Wong
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.