From: Sage Weil <sage@inktank.com>
Date: Mon, 1 Apr 2013 04:40:42 +0000 (-0700)
Subject: client: do sync read when 'client oc = false'
X-Git-Tag: v0.60~2^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c01e2e42f368ca003e03debe9a7bd5f12eb79d2c;p=ceph.git

client: do sync read when 'client oc = false'

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 18fd7aae4f42..74647fb8ddaa 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -5631,7 +5631,8 @@ int Client::_read(Fh *f, int64_t offset, uint64_t size, bufferlist *bl)
     movepos = true;
   }
 
-  if (!conf->client_debug_force_sync_read && (have & CEPH_CAP_FILE_CACHE)) {
+  if (!conf->client_debug_force_sync_read &&
+      (cct->_conf->client_oc && (have & CEPH_CAP_FILE_CACHE))) {
 
     if (f->flags & O_RSYNC) {
       _flush_range(in, offset, size);