]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
msgr: fix signedness in alloc_aligned_buffer
authorSage Weil <sage@newdream.net>
Wed, 18 May 2011 17:06:44 +0000 (10:06 -0700)
committerSage Weil <sage@newdream.net>
Wed, 18 May 2011 17:07:02 +0000 (10:07 -0700)
Signed-off-by: Sage Weil <sage@newdream.net>
src/msg/SimpleMessenger.cc

index 75df7c562e8a1d4a250f6cffae420e7fc862db51..5734555a09097c7878a86f3f639dcf801e892882 100644 (file)
@@ -1775,11 +1775,11 @@ void SimpleMessenger::Pipe::unlock_maybe_reap()
   }
 }
 
-static void alloc_aligned_buffer(bufferlist& data, int len, int off)
+static void alloc_aligned_buffer(bufferlist& data, unsigned len, unsigned off)
 {
   // create a buffer to read into that matches the data alignment
-  int left = len;
-  int head = 0;
+  unsigned left = len;
+  unsigned head = 0;
   if (off & ~PAGE_MASK) {
     // head
     head = MIN(PAGE_SIZE - (off & ~PAGE_MASK), left);
@@ -1787,7 +1787,7 @@ static void alloc_aligned_buffer(bufferlist& data, int len, int off)
     data.push_back(bp);
     left -= head;
   }
-  int middle = left & PAGE_MASK;
+  unsigned middle = left & PAGE_MASK;
   if (middle > 0) {
     bufferptr bp = buffer::create_page_aligned(middle);
     data.push_back(bp);