From: Darrick J. Wong <darrick.wong@oracle.com>
Date: Wed, 18 Oct 2017 18:39:01 +0000 (-0500)
Subject: xfs: fix compiler warnings
X-Git-Tag: v4.14.0-rc1~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8cee3e445bb55c631b03277f967cc47830b49925;p=thirdparty%2Fxfsprogs-dev.git

xfs: fix compiler warnings

Source kernel commit: 7bf7a193a90cadccaad21c5970435c665c40fe27

Fix up all the compiler warnings that have crept in.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
---

diff --git a/libxfs/xfs_inode_fork.c b/libxfs/xfs_inode_fork.c
index c8778bec3..0c695cb5b 100644
--- a/libxfs/xfs_inode_fork.c
+++ b/libxfs/xfs_inode_fork.c
@@ -1497,14 +1497,11 @@ xfs_iext_realloc_indirect(
 	int		new_size)	/* new indirection array size */
 {
 #ifdef DEBUG
-	int		nlists;		/* number of irec's (ex lists) */
-	int		size;		/* current indirection array size */
-
 	ASSERT(ifp->if_flags & XFS_IFEXTIREC);
-	nlists = ifp->if_real_bytes / XFS_IEXT_BUFSZ;
-	size = nlists * sizeof(xfs_ext_irec_t);
 	ASSERT(ifp->if_real_bytes);
-	ASSERT((new_size >= 0) && (new_size != size));
+	ASSERT((new_size >= 0) &&
+	       (new_size != ((ifp->if_real_bytes / XFS_IEXT_BUFSZ) *
+			     sizeof(xfs_ext_irec_t))));
 #endif
 	if (new_size == 0) {
 		xfs_iext_destroy(ifp);