On 5/11/17 7:49 AM, 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]
>
> This one is clearly fine, and we can add a comparison to zero
> to shut up the warning.
>
> Signed-off-by: Arnd Bergmann <a...@arndb.de>
Thanks Arnd -
Reviewed-by: Eric Sandeen <sand...@redhat.com>
> ---
> 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..cbd3ffe42f39 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_BOFF(ip) != 0) &&
> 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_BOFF(tip) != 0) &&
> XFS_BMAP_BMDR_SPACE(ip->i_df.if_broot) >
> XFS_IFORK_BOFF(tip))
> return -EINVAL;
> if (XFS_IFORK_NEXTENTS(ip, XFS_DATA_FORK) <=
>
