Merge pull request #8532 from xiexingguo/xxg-wip-misc

osd: miscellaneous fixes

Reviewed-by: Sage Weil <sage@redhat.com>

diff --cc src/include/rados.h
Simple merge

diff --cc src/os/filestore/FileStore.cc
Simple merge

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

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

diff --cc src/osd/PG.h
Simple merge

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

diff --cc src/osd/osd_types.h
Simple merge