From: Ilya Dryomov <ilya.dryomov@inktank.com>
Date: Mon, 10 Feb 2014 17:34:44 +0000 (+0200)
Subject: common/buffer: fix build breakage for CEPH_HAVE_SETPIPE_SZ
X-Git-Tag: v0.78~208^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1204%2Fhead;p=ceph.git

common/buffer: fix build breakage for CEPH_HAVE_SETPIPE_SZ

common/buffer.cc fails to build if CEPH_HAVE_SETPIPE_SZ is defined.
Fix it.

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
---

diff --git a/src/common/buffer.cc b/src/common/buffer.cc
index eab91433aa90..4279cdbbc681 100644
--- a/src/common/buffer.cc
+++ b/src/common/buffer.cc
@@ -94,7 +94,7 @@ static uint32_t simple_spinlock_t buffer_debug_lock = SIMPLE_SPINLOCK_INITIALIZE
     if (r < 0)
       return r;
     buf[r] = '\0';
-    size = strict_strtol(buf, 10, &err);
+    size_t size = strict_strtol(buf, 10, &err);
     if (!err.empty())
       return -EIO;
     buffer_max_pipe_size.set(size);
@@ -108,7 +108,7 @@ static uint32_t simple_spinlock_t buffer_debug_lock = SIMPLE_SPINLOCK_INITIALIZE
     if (size)
       return size;
     if (update_max_pipe_size() == 0)
-      return buffer_max_pipe_size.read()
+      return buffer_max_pipe_size.read();
 #endif
     // this is the max size hardcoded in linux before 2.6.35
     return 65536;