xfs: avoid harmless gcc-7 warnings
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: Christoph Hellwig <hch@lst.de> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
This commit is contained in:
Родитель
f990fc5ad1
Коммит
0cbe48cc58
|
@ -1617,7 +1617,7 @@ xfs_swap_extents_check_format(
|
||||||
* extent format...
|
* extent format...
|
||||||
*/
|
*/
|
||||||
if (tip->i_d.di_format == XFS_DINODE_FMT_BTREE) {
|
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))
|
XFS_BMAP_BMDR_SPACE(tip->i_df.if_broot) > XFS_IFORK_BOFF(ip))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
if (XFS_IFORK_NEXTENTS(tip, XFS_DATA_FORK) <=
|
if (XFS_IFORK_NEXTENTS(tip, XFS_DATA_FORK) <=
|
||||||
|
@ -1627,7 +1627,7 @@ xfs_swap_extents_check_format(
|
||||||
|
|
||||||
/* Reciprocal target->temp btree format checks */
|
/* Reciprocal target->temp btree format checks */
|
||||||
if (ip->i_d.di_format == XFS_DINODE_FMT_BTREE) {
|
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))
|
XFS_BMAP_BMDR_SPACE(ip->i_df.if_broot) > XFS_IFORK_BOFF(tip))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
if (XFS_IFORK_NEXTENTS(ip, XFS_DATA_FORK) <=
|
if (XFS_IFORK_NEXTENTS(ip, XFS_DATA_FORK) <=
|
||||||
|
|
Загрузка…
Ссылка в новой задаче