Merge pull request #10201 from xiexingguo/xxg-wip-bluestore-2016-07-08

os/bluestore: misc cleanups

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
Reviewed-by: Sage Weil <sage@redhat.com>

diff --cc src/os/bluestore/BlueStore.cc
Simple merge

diff --cc src/os/bluestore/bluestore_types.cc
Simple merge

diff --cc src/os/bluestore/bluestore_types.h
Simple merge