From: John Spray <jspray@redhat.com>
Date: Thu, 22 Jun 2017 11:06:41 +0000 (-0400)
Subject: Merge pull request #15430 from jcsp/wip-20165
X-Git-Tag: v12.1.0~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7e991fe36e538eb7d402a1c707c1521c0a8bbe87;p=ceph.git

Merge pull request #15430 from jcsp/wip-20165

mds: fix hangs involving re-entrant calls to journaler

Reviewed-by: Yan, Zheng <zyan@redhat.com>
---

7e991fe36e538eb7d402a1c707c1521c0a8bbe87