Merge pull request #18481 from xiexingguo/wip-choose-acting

osd/PG: miscellaneous choose acting changes and cleanups

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

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

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

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

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