client: fix warnings

client/Client.cc: In member function 'int Client::_read(Fh*, int64_t, uint64_t, ceph::bufferlist*)':
warning: client/Client.cc:5893:27: comparison between signed and unsigned integer expressions [-Wsign-compare]
client/Client.cc: In member function 'int Client::_write(Fh*, int64_t, uint64_t, const char*)':
warning: client/Client.cc:6235:30: 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 c2a1757b2af609bca344c8ef747145c41dada48a..d7d9a507d3eac3be4351de8da8346172f77e52c2 100644 (file)
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -5890,7 +5890,7 @@ int Client::_read(Fh *f, int64_t offset, uint64_t size, bufferlist *bl)
           bl->substr_of(in->inline_data, offset, len - offset);
           bl->append_zero(endoff - len);
         }
-      } else if (offset < endoff) {
+      } else if ((uint64_t)offset < endoff) {
         bl->append_zero(endoff - offset);
       }
 

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index 80828c5708beb63ff7956bd597e63366f62ce008..41fc9e1ea6fe943924cc2e8611cabd761f8e2454 100644 (file)
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -263,7 +263,7 @@ OPTION(client_oc_max_dirty_age, OPT_DOUBLE, 5.0)      // max age in cache before
 OPTION(client_oc_max_objects, OPT_INT, 1000)      // max objects in cache
 OPTION(client_debug_force_sync_read, OPT_BOOL, false)     // always read synchronously (go to osds)
 OPTION(client_debug_inject_tick_delay, OPT_INT, 0) // delay the client tick for a number of seconds
-OPTION(client_max_inline_size, OPT_INT, 4096)
+OPTION(client_max_inline_size, OPT_U64, 4096)
 // note: the max amount of "in flight" dirty data is roughly (max - target)
 OPTION(fuse_use_invalidate_cb, OPT_BOOL, false) // use fuse 2.8+ invalidate callback to keep page cache consistent
 OPTION(fuse_allow_other, OPT_BOOL, true)