From: Josh Durgin <josh.durgin@inktank.com>
Date: Mon, 25 Nov 2013 22:37:57 +0000 (-0800)
Subject: buffer: turn off zero-copy reads for now
X-Git-Tag: v0.74~65^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=03d63c4b2d63b655924c5657637e85abdef40899;p=ceph.git

buffer: turn off zero-copy reads for now

Some users will need to be changed to handle getting the correct
length from bufferlist::read_fd.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
---

diff --git a/src/common/buffer.cc b/src/common/buffer.cc
index 22962591019..24b8182abb4 100644
--- a/src/common/buffer.cc
+++ b/src/common/buffer.cc
@@ -1504,7 +1504,7 @@ int buffer::list::read_file(const char *fn, std::string *error)
 ssize_t buffer::list::read_fd(int fd, size_t len)
 {
   // try zero copy first
-  if (read_fd_zero_copy(fd, len) == 0) {
+  if (false && read_fd_zero_copy(fd, len) == 0) {
     // TODO fix callers to not require correct read size, which is not
     // available for raw_pipe until we actually inspect the data
     return 0;