objectcacher: write vs truncate races are ok

It is possible to write a buffer, truncate it away, and then not have it when we get the commit. Fixes: ceph#1467 Signed-off-by: Sage Weil <[email protected]>
zmc · Sep 1, 2011 · c8c205f · c8c205f
1 parent b2c762b
commit c8c205f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/osdc/ObjectCacher.cc b/src/osdc/ObjectCacher.cc
@@ -632,7 +632,6 @@ void ObjectCacher::bh_write_commit(int64_t poolid, sobject_t oid, loff_t start,
           << dendl;
   if (objects[poolid].count(oid) == 0) {
     ldout(cct, 7) << "bh_write_commit no object cache" << dendl;
-    assert(0);
   } else {
     Object *ob = objects[poolid][oid];
 
@@ -642,7 +641,8 @@ void ObjectCacher::bh_write_commit(int64_t poolid, sobject_t oid, loff_t start,
          p++) {
       BufferHead *bh = p->second;
 
-      if (bh->start() > start+(loff_t)length) break;
+      if (bh->start() > start+(loff_t)length)
+	break;
 
       if (bh->start() < start &&
           bh->end() > start+(loff_t)length) {