From: Jos Collin <jcollin@redhat.com>
Date: Sat, 22 Apr 2017 08:19:20 +0000 (+0530)
Subject: osdc: warning: comparison between signed and unsigned integer expressions
X-Git-Tag: v12.0.3~277^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=59fb7ae1543b5ff1d39b45ecc2b4423293fe9e32;p=ceph.git

osdc: warning: comparison between signed and unsigned integer expressions

The following warning appears during make. Fixed the review comments too.
[ 28%] Building CXX object src/mds/CMakeFiles/mds.dir/__/osdc/Journaler.cc.o
./src/osdc/Journaler.cc: In member function ‘void Journaler::_do_flush(unsigned int)’:
./src/osdc/Journaler.cc:643:16: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
     if (newlen < len) {
         ~~~~~~~^~~~~

Signed-off-by: Jos Collin <jcollin@redhat.com>
---

diff --git a/src/osdc/Journaler.cc b/src/osdc/Journaler.cc
index 642b15be4306..7c1be262644b 100644
--- a/src/osdc/Journaler.cc
+++ b/src/osdc/Journaler.cc
@@ -640,7 +640,7 @@ void Journaler::_do_flush(unsigned amount)
       waiting_for_zero = true;
       return;
     }
-    if (newlen < len) {
+    if (static_cast<uint64_t>(newlen) < len) {
       ldout(cct, 10) << "_do_flush wanted to do " << flush_pos << "~" << len
 		     << " but hit prezero_pos " << prezero_pos
 		     << ", will do " << flush_pos << "~" << newlen << dendl;