Merge pull request #19354 from shinobu-x/osd_atomic

author Yuri Weinstein <yuri.weinstein@gmail.com>

Sat, 6 Jan 2018 17:29:52 +0000 (09:29 -0800)

committer GitHub <noreply@github.com>

Sat, 6 Jan 2018 17:29:52 +0000 (09:29 -0800)
author Yuri Weinstein <yuri.weinstein@gmail.com>
Sat, 6 Jan 2018 17:29:52 +0000 (09:29 -0800)
committer GitHub <noreply@github.com>
Sat, 6 Jan 2018 17:29:52 +0000 (09:29 -0800)
diff --cc src/osd/OSD.h
Simple merge
diff --cc src/osd/PG.h
Simple merge
diff --cc src/osd/osd_types.h
Simple merge
author	Yuri Weinstein <yuri.weinstein@gmail.com>
	Sat, 6 Jan 2018 17:29:52 +0000 (09:29 -0800)
committer	GitHub <noreply@github.com>
	Sat, 6 Jan 2018 17:29:52 +0000 (09:29 -0800)
		1	2
src/osd/OSD.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.h	patch \|	diff1 \|	diff2 \|	blob \| history