Merge pull request #15816 from chardan/jfw-wip-consolidate-spinlocks

author Sage Weil <sage@newdream.net>

Fri, 1 Sep 2017 21:28:03 +0000 (16:28 -0500)

committer GitHub <noreply@github.com>

Fri, 1 Sep 2017 21:28:03 +0000 (16:28 -0500)
author Sage Weil <sage@newdream.net>
Fri, 1 Sep 2017 21:28:03 +0000 (16:28 -0500)
committer GitHub <noreply@github.com>
Fri, 1 Sep 2017 21:28:03 +0000 (16:28 -0500)
diff --cc src/compressor/Compressor.cc
Simple merge
diff --cc src/osd/OSD.h
Simple merge
diff --cc src/test/perf_local.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Fri, 1 Sep 2017 21:28:03 +0000 (16:28 -0500)
committer	GitHub <noreply@github.com>
	Fri, 1 Sep 2017 21:28:03 +0000 (16:28 -0500)
		1	2
src/compressor/Compressor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/perf_local.cc	patch \|	diff1 \|	diff2 \|	blob \| history