From: Sage Weil <sage@inktank.com>
Date: Mon, 17 Feb 2014 17:58:56 +0000 (-0800)
Subject: client: don't populate Client::barriers from read accesses
X-Git-Tag: v0.78~167^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ce643e007af44cec12b2ad36778a3c1338c11ea7;p=ceph.git

client: don't populate Client::barriers from read accesses

If the entry doesn't exist, no need to create it.

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

diff --git a/src/client/Client.cc b/src/client/Client.cc
index bf794124bf83..a41d3c2217a7 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -8293,10 +8293,10 @@ int Client::ll_commit_blocks(Inode *in,
       return -EINVAL;
     }
 
-    bctx = this->barriers[ino];
-    if (bctx) {
+    map<uint64_t, BarrierContext*>::iterator p = barriers.find(ino);
+    if (p != barriers.end()) {
       barrier_interval civ(offset, length);
-      bctx->commit_barrier(civ);
+      p->second->commit_barrier(civ);
     }
 
     return 0;