]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #11052 from yuyuyu101/wip-shutdown-deadlock
authorYuri Weinstein <yuri.weinstein@gmail.com>
Thu, 22 Sep 2016 16:03:39 +0000 (09:03 -0700)
committerGitHub <noreply@github.com>
Thu, 22 Sep 2016 16:03:39 +0000 (09:03 -0700)
OSD: avoid FileStore finisher deadlock in osd_lock when shutdown OSD

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/osd/OSD.cc

diff --cc src/osd/OSD.cc
Simple merge