ceph/ceph — pull request #1638 by liewegas (2014-04-09 23:08:49+00:00)
Title: osd/ReplicatedPG: adjust obc + snapset_obc locking strategy

Prevoiusly we assumed that if we had snapset_obc set, !exists on the head and
if we got the snapdir lock we were good to take the head lock too. This is no
the case when:

- delete queued
- takes wr lock on both head and snapdir
- delete commits (but not yet applied)
- stat
- tries to take wr lock on head
- blocks, toggles w=1 state on *head only*
- copy-from
- tries to take wr lock on snapdir, succeeds
- tries to take wr lock on head, fails because w=1
- fails the assert(got)

The problem is that the read and write paths are taking different locks and
we are expecting them to operate in synchrony.

Fix this by using the same ordering for reads as well as write: if the
snapset_obc is defined, take the read lock on that too, just as we do with a
write.

Fixes: #8046 Signed-off-by: Sage Weil