osd: use dirty flags in activate(), merge_log()

These are all called from within the state machine, so we can simply set
the dirty flags.

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index d09a4f7653328531bcc35a33fa54dd7473bc82f1..f6342a4c12b6c1dcf00d72e190de32b4637851b4 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -485,8 +485,8 @@ void PG::merge_log(ObjectStore::Transaction& t,
   dout(10) << "merge_log result " << log << " " << missing << " changed=" << changed << dendl;
 
   if (changed) {
-    write_info(t);
-    write_log(t);
+    dirty_info = true;
+    dirty_log = true;
   }
 }
 
@@ -1227,8 +1227,8 @@ void PG::activate(ObjectStore::Transaction& t, list<Context*>& tfin,
   need_up_thru = false;
 
   // write pg info, log
-  write_info(t);
-  write_log(t);
+  dirty_info = true;
+  dirty_log = true;
 
   // clean up stray objects
   clean_up_local(t);