]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
client: fix warning
authorSage Weil <sage@inktank.com>
Wed, 19 Jun 2013 17:50:49 +0000 (10:50 -0700)
committerSage Weil <sage@inktank.com>
Wed, 19 Jun 2013 17:50:49 +0000 (10:50 -0700)
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>
src/client/Client.cc

index a14cf85d12d3c88016a8a8e2311b3e5aef3e4875..80cce8a1563ad9e368a03030c3165ca3af52769e 100644 (file)
@@ -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);