Merge pull request #19718 from ifed01/wip-ifed-freelist-cleanup

author Kefu Chai <tchaikov@gmail.com>

Fri, 5 Jan 2018 15:59:58 +0000 (23:59 +0800)

committer GitHub <noreply@github.com>

Fri, 5 Jan 2018 15:59:58 +0000 (23:59 +0800)
author Kefu Chai <tchaikov@gmail.com>
Fri, 5 Jan 2018 15:59:58 +0000 (23:59 +0800)
committer GitHub <noreply@github.com>
Fri, 5 Jan 2018 15:59:58 +0000 (23:59 +0800)
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
diff --cc src/os/bluestore/BlueStore.h
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Fri, 5 Jan 2018 15:59:58 +0000 (23:59 +0800)
committer	GitHub <noreply@github.com>
	Fri, 5 Jan 2018 15:59:58 +0000 (23:59 +0800)
		1	2
src/os/bluestore/BlueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BlueStore.h	patch \|	diff1 \|	diff2 \|	blob \| history