librbd: simplify IO method signatures for 32bit environments

Signed-off-by: Jason Dillaman <dillaman@redhat.com>

diff --git a/src/librbd/AioImageRequestWQ.cc b/src/librbd/AioImageRequestWQ.cc
index ff9d8e4a3e1fd3870c39fda994db0445986502c1..d1cb86edf423d749976cb7467a29a3648f9c5a92 100644 (file)
--- a/src/librbd/AioImageRequestWQ.cc
+++ b/src/librbd/AioImageRequestWQ.cc
@@ -24,7 +24,7 @@ AioImageRequestWQ::AioImageRequestWQ(ImageCtx *image_ctx, const string &name,
   ldout(cct, 5) << this << " " << ": ictx=" << image_ctx << dendl;
 }
 
-ssize_t AioImageRequestWQ::read(uint64_t off, size_t len, char *buf,
+ssize_t AioImageRequestWQ::read(uint64_t off, uint64_t len, char *buf,
                                 int op_flags) {
   CephContext *cct = m_image_ctx.cct;
   ldout(cct, 20) << "read: ictx=" << &m_image_ctx << ", off=" << off << ", "
@@ -39,7 +39,7 @@ ssize_t AioImageRequestWQ::read(uint64_t off, size_t len, char *buf,
   return cond.wait();
 }
 
-ssize_t AioImageRequestWQ::write(uint64_t off, size_t len, const char *buf,
+ssize_t AioImageRequestWQ::write(uint64_t off, uint64_t len, const char *buf,
                                  int op_flags) {
   CephContext *cct = m_image_ctx.cct;
   ldout(cct, 20) << "write: ictx=" << &m_image_ctx << ", off=" << off << ", "
@@ -86,7 +86,7 @@ int AioImageRequestWQ::discard(uint64_t off, uint64_t len) {
   return len;
 }
 
-void AioImageRequestWQ::aio_read(AioCompletion *c, uint64_t off, size_t len,
+void AioImageRequestWQ::aio_read(AioCompletion *c, uint64_t off, uint64_t len,
                                  char *buf, bufferlist *pbl, int op_flags) {
   c->init_time(&m_image_ctx, librbd::AIO_TYPE_READ);
   CephContext *cct = m_image_ctx.cct;
@@ -102,7 +102,7 @@ void AioImageRequestWQ::aio_read(AioCompletion *c, uint64_t off, size_t len,
   }
 }
 
-void AioImageRequestWQ::aio_write(AioCompletion *c, uint64_t off, size_t len,
+void AioImageRequestWQ::aio_write(AioCompletion *c, uint64_t off, uint64_t len,
                                   const char *buf, int op_flags) {
   c->init_time(&m_image_ctx, librbd::AIO_TYPE_WRITE);
   CephContext *cct = m_image_ctx.cct;

diff --git a/src/librbd/AioImageRequestWQ.h b/src/librbd/AioImageRequestWQ.h
index f668c9f03f12111f3c38a86c6e74d6a00839292d..9cdb05c6cac6179efd4df5de1f9a40e6b6889543 100644 (file)
--- a/src/librbd/AioImageRequestWQ.h
+++ b/src/librbd/AioImageRequestWQ.h
@@ -20,13 +20,13 @@ public:
   AioImageRequestWQ(ImageCtx *image_ctx, const string &name, time_t ti,
                     ThreadPool *tp);
 
-  ssize_t read(uint64_t off, size_t len, char *buf, int op_flags);
-  ssize_t write(uint64_t off, size_t len, const char *buf, int op_flags);
+  ssize_t read(uint64_t off, uint64_t len, char *buf, int op_flags);
+  ssize_t write(uint64_t off, uint64_t len, const char *buf, int op_flags);
   int discard(uint64_t off, uint64_t len);
 
-  void aio_read(AioCompletion *c, uint64_t off, size_t len, char *buf,
+  void aio_read(AioCompletion *c, uint64_t off, uint64_t len, char *buf,
                 bufferlist *pbl, int op_flags);
-  void aio_write(AioCompletion *c, uint64_t off, size_t len, const char *buf,
+  void aio_write(AioCompletion *c, uint64_t off, uint64_t len, const char *buf,
                  int op_flags);
   void aio_discard(AioCompletion *c, uint64_t off, uint64_t len);
   void aio_flush(AioCompletion *c);