]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
client: fix num_flushing_caps accounting
authorSage Weil <sage.weil@dreamhost.com>
Tue, 5 Jul 2011 20:58:53 +0000 (13:58 -0700)
committerSage Weil <sage.weil@dreamhost.com>
Tue, 5 Jul 2011 20:58:53 +0000 (13:58 -0700)
This only affects debug output, fwiw.

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

index 7b73073a1d57715d1fc8cf6414436793a7347853..ca426be295513a6f11c2642d1da832d9183b261c 100644 (file)
@@ -2465,10 +2465,6 @@ int Client::mark_caps_flushing(Inode *in)
 
   int flushing = in->dirty_caps;
   assert(flushing);
-  in->flushing_caps |= flushing;
-  in->dirty_caps = 0;
-  
-  in->flushing_cap_seq = ++last_flush_seq;
 
   if (flushing && !in->flushing_caps) {
     ldout(cct, 10) << "mark_caps_flushing " << ccap_string(flushing) << " " << *in << dendl;
@@ -2476,6 +2472,12 @@ int Client::mark_caps_flushing(Inode *in)
   } else {
     ldout(cct, 10) << "mark_caps_flushing (more) " << ccap_string(flushing) << " " << *in << dendl;
   }
+
+  in->flushing_caps |= flushing;
+  in->dirty_caps = 0;
+  in->flushing_cap_seq = ++last_flush_seq;
+
   session->flushing_caps.push_back(&in->flushing_cap_item);
 
   return flushing;