Merge PR #39394 into master

author Sage Weil <sage@newdream.net>

Sun, 21 Feb 2021 16:51:32 +0000 (11:51 -0500)

committer Sage Weil <sage@newdream.net>

Sun, 21 Feb 2021 16:51:32 +0000 (11:51 -0500)
author Sage Weil <sage@newdream.net>
Sun, 21 Feb 2021 16:51:32 +0000 (11:51 -0500)
committer Sage Weil <sage@newdream.net>
Sun, 21 Feb 2021 16:51:32 +0000 (11:51 -0500)
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
diff --cc src/os/bluestore/BlueStore.h
Simple merge
author	Sage Weil <sage@newdream.net>
	Sun, 21 Feb 2021 16:51:32 +0000 (11:51 -0500)
committer	Sage Weil <sage@newdream.net>
	Sun, 21 Feb 2021 16:51:32 +0000 (11:51 -0500)
		1	2
src/os/bluestore/BlueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BlueStore.h	patch \|	diff1 \|	diff2 \|	blob \| history