Merge pull request #2675 from ceph/wip-coverity-20141003

Fix issues from SCA and Coverity

Reviewed-by: Sage Weil <sage@redhat.com>

diff --cc src/test/erasure-code/ceph_erasure_code_benchmark.cc
Simple merge