From: Sage Weil <sage@newdream.net>
Date: Wed, 18 Jun 2008 02:49:41 +0000 (-0700)
Subject: objectcacher: avoid unnecessary flush_set calls
X-Git-Tag: v0.3~97
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=87d5220c117e5304a3993d0bd80ab38a814f9ed6;p=ceph.git

objectcacher: avoid unnecessary flush_set calls
---

diff --git a/src/osdc/ObjectCacher.cc b/src/osdc/ObjectCacher.cc
index 4f611298f93f..e2fe09ad8ae9 100644
--- a/src/osdc/ObjectCacher.cc
+++ b/src/osdc/ObjectCacher.cc
@@ -1397,6 +1397,9 @@ bool ObjectCacher::commit_set(inodeno_t ino, Context *onfinish)
 
   dout(10) << "commit_set " << ino << dendl;
 
+  // make sure it's flushing.
+  flush_set(ino);
+
   C_Gather *gather = 0; // we'll need to wait for all objects to commit
 
   set<Object*>& s = objects_by_ino[ino];
@@ -1406,9 +1409,6 @@ bool ObjectCacher::commit_set(inodeno_t ino, Context *onfinish)
        i++) {
     Object *ob = *i;
     
-    // make sure it's flushing.
-    flush_set(ino);
-
     if (ob->last_write_tid > ob->last_commit_tid) {
       dout(10) << "commit_set " << ino << " " << *ob 
                << " will finish on commit tid " << ob->last_write_tid