]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #6916 from xiexingguo/xxg-wip-14072
authorSage Weil <sage@redhat.com>
Sun, 3 Jan 2016 18:17:51 +0000 (13:17 -0500)
committerSage Weil <sage@redhat.com>
Sun, 3 Jan 2016 18:17:51 +0000 (13:17 -0500)
osd: fix null pointer access and race condition

Reviewed-by: Kefu Chai <kchai@redhat.com>
1  2 
src/osd/OSD.cc

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