From: Darrick J. Wong <darrick.wong@oracle.com>
Date: Fri, 9 Mar 2018 02:35:22 +0000 (-0600)
Subject: misc: fix gcc 7.3 warnings
X-Git-Tag: v4.16.0-rc1~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a93fcc042a7c79786dfe72f1c14737290e629c27;p=thirdparty%2Fxfsprogs-dev.git

misc: fix gcc 7.3 warnings

Fix various compiler warnings that pop up in 7.3.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
---

diff --git a/db/bit.c b/db/bit.c
index bf8d80efb..a6d8c9f43 100644
--- a/db/bit.c
+++ b/db/bit.c
@@ -111,11 +111,11 @@ getbitval(
 			/* handle endian swap here */
 #if __BYTE_ORDER == LITTLE_ENDIAN
 			if (i == 0 && signext && nbits < 64)
-				rval = -1LL << nbits;
+				rval = (~0ULL) << nbits;
 			rval |= 1ULL << (nbits - i - 1);
 #else
 			if ((i == (nbits - 1)) && signext && nbits < 64)
-				rval |= (-1LL << nbits);
+				rval |= ((~0ULL) << nbits);
 			rval |= 1ULL << (nbits - i - 1);
 #endif
 		}
diff --git a/repair/dinode.c b/repair/dinode.c
index 32cc76917..07bcf80ea 100644
--- a/repair/dinode.c
+++ b/repair/dinode.c
@@ -525,6 +525,7 @@ _("data fork in rt inode %" PRIu64 " found metadata block %" PRIu64 " in rt bmap
 		case XR_E_INUSE:
 			if (pwe)
 				break;
+			/* fall through */
 		case XR_E_MULT:
 			set_rtbmap(ext, XR_E_MULT);
 			do_warn(
diff --git a/repair/scan.c b/repair/scan.c
index e4ac4a738..0fc41f2be 100644
--- a/repair/scan.c
+++ b/repair/scan.c
@@ -705,6 +705,7 @@ _("%s freespace btree block claimed (state %d), agno %d, bno %d, suspect %d\n"),
 							     XR_E_FREE);
 						break;
 					}
+					/* fall through */
 				default:
 					do_warn(
 	_("block (%d,%d-%d) multiply claimed by %s space tree, state - %d\n"),