Merge pull request #30737 from tchaikov/wip-os/bluestore/cleanup

author Kefu Chai <kchai@redhat.com>

Mon, 14 Oct 2019 14:30:05 +0000 (22:30 +0800)

committer GitHub <noreply@github.com>

Mon, 14 Oct 2019 14:30:05 +0000 (22:30 +0800)
author Kefu Chai <kchai@redhat.com>
Mon, 14 Oct 2019 14:30:05 +0000 (22:30 +0800)
committer GitHub <noreply@github.com>
Mon, 14 Oct 2019 14:30:05 +0000 (22:30 +0800)
diff --cc src/os/bluestore/BlueFS.cc
Simple merge
diff --cc src/os/bluestore/BlueFS.h
Simple merge
author	Kefu Chai <kchai@redhat.com>
	Mon, 14 Oct 2019 14:30:05 +0000 (22:30 +0800)
committer	GitHub <noreply@github.com>
	Mon, 14 Oct 2019 14:30:05 +0000 (22:30 +0800)
		1	2
src/os/bluestore/BlueFS.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BlueFS.h	patch \|	diff1 \|	diff2 \|	blob \| history