git-server-git.apps.pok.os.sepia.ceph.com Git

author	Jason Dillaman <dillaman@redhat.com>
	Thu, 25 Jun 2015 20:51:31 +0000 (16:51 -0400)
committer	Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
	Tue, 14 Jul 2015 14:11:49 +0000 (19:41 +0530)
commit	5c812c1552d954f2c91c000332ddc74c9e91825a
tree	bbb8d80c11d802499fad1ffed47347c93104f929	tree \| snapshot
parent	9a79e8e7da5f34f1adaf6137e01bcd42766ae677	commit \| diff

librbd: prevent object map updates from being interrupted

Object map updates were being canceled in-flight when the exclusive lock
is released. This resulted in an ERESTART error code bubbling up to
AioRequest.

Fixes: 12165
Backport: hammer
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 590cdc90edaf4f4ff06c97eb2f43b92ab9b60084)

Conflicts:
src/librbd/ObjectMap.h
conflict due to a variable `m_snap_id' which was introduced in PR #4140
which is dropped as we are not backporting that feature