Merge PR #22607 into master

* refs/pull/22607/head:
	common/options: convert many TYPE_[U]INT -> TYPE_SIZE
	common/options: remove journal_max_corrupt_search

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

diff --cc src/common/legacy_config_opts.h
Simple merge

diff --cc src/common/options.cc
Simple merge

diff --cc src/mon/Monitor.cc
Simple merge

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

diff --cc src/rgw/rgw_op.h
Simple merge