]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
JournalingObjectStore: lock journal_lock at top of journal_replay
authorSamuel Just <sam.just@inktank.com>
Tue, 25 Sep 2012 23:07:23 +0000 (16:07 -0700)
committerSamuel Just <sam.just@inktank.com>
Wed, 26 Sep 2012 17:16:24 +0000 (10:16 -0700)
CID 716968: Data race condition (MISSING_LOCK)At (6): Accessing "this->op_seq"
("JournalingObjectStore.op_seq") requires the "Mutex._m" lock.

Doesn't really matter, but this should satisfy coverity.

Signed-off-by: Samuel Just <sam.just@inktank.com>
src/os/JournalingObjectStore.cc

index 2119f9538cf80c30331019637528513860f0c5c2..83864fc00cc525719638f8027c7b5baf06cf17c9 100644 (file)
@@ -37,10 +37,12 @@ int JournalingObjectStore::journal_replay(uint64_t fs_op_seq)
     fs_op_seq = g_conf->journal_replay_from - 1;
   }
 
+  journal_lock.Lock();
   op_seq = fs_op_seq;
   committed_seq = fs_op_seq;
   committing_seq = fs_op_seq;
   applied_seq = fs_op_seq;
+  journal_lock.Unlock();
 
   if (!journal)
     return 0;