]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
client: don't populate Client::barriers from read accesses
authorSage Weil <sage@inktank.com>
Mon, 17 Feb 2014 17:58:56 +0000 (09:58 -0800)
committerSage Weil <sage@inktank.com>
Mon, 17 Feb 2014 18:15:58 +0000 (10:15 -0800)
If the entry doesn't exist, no need to create it.

Signed-off-by: Sage Weil <sage@inktank.com>
src/client/Client.cc

index bf794124bf83de8f889114305117817c9cc983f4..a41d3c2217a7f468ed9247f5d56cb48d6e000dca 100644 (file)
@@ -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;