]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #24761 into nautilus
authorSage Weil <sage@redhat.com>
Sat, 27 Oct 2018 03:07:27 +0000 (22:07 -0500)
committerSage Weil <sage@redhat.com>
Sat, 27 Oct 2018 03:07:27 +0000 (22:07 -0500)
* refs/pull/24761/head:
osd: fix race between op_wq and context_queue

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Jianpeng Ma <jianpeng.ma@intel.com>

Trivial merge