From: Sage Weil <sage@inktank.com>
Date: Wed, 19 Jun 2013 17:50:49 +0000 (-0700)
Subject: client: fix warning
X-Git-Tag: v0.66~48
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fd83bc3f5ead56c77bec9d0f51ed942f6b9b752e;p=ceph.git

client: fix warning

client/Client.cc: In member function 'int Client::_read_sync(Fh*, uint64_t, uint64_t, ceph::bufferlist*)':
warning: client/Client.cc:5831:13: comparison between signed and unsigned integer expressions [-Wsign-compare]

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/client/Client.cc b/src/client/Client.cc
index a14cf85d12d3..80cce8a1563a 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -5828,7 +5828,9 @@ int Client::_read_sync(Fh *f, uint64_t off, uint64_t len, bufferlist *bl)
     if (r >= 0 && r < wanted) {
       if (pos < in->size) {
 	// zero up to known EOF
-	int some = MIN(in->size - pos, left);
+	int some = in->size - pos;
+	if (some > left)
+	  some = left;
 	bufferptr z(some);
 	z.zero();
 	bl->push_back(z);