]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ObjectCacher: remove useless conditional
authorJosh Durgin <josh.durgin@dreamhost.com>
Thu, 5 Apr 2012 21:00:42 +0000 (14:00 -0700)
committerSage Weil <sage.weil@dreamhost.com>
Sat, 14 Apr 2012 03:46:35 +0000 (20:46 -0700)
We assert this condition at the beginning of the function.

Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
src/osdc/ObjectCacher.cc

index 9d36d6bc0fea4fb36174cada216897d32841d8ba..20ac4f3ba7e894a20e6cc5c5e63587d70ea4962c 100644 (file)
@@ -1366,8 +1366,7 @@ bool ObjectCacher::commit_set(ObjectSet *oset, Context *onfinish)
                << " will finish on commit tid " << ob->last_write_tid
                << dendl;
       safe = false;
-      if (onfinish != NULL)
-        ob->waitfor_commit[ob->last_write_tid].push_back(gather.new_sub());
+      ob->waitfor_commit[ob->last_write_tid].push_back(gather.new_sub());
     }
   }
   gather.activate();