From: Sage Weil <sage@redhat.com>
Date: Sat, 22 Jul 2017 18:56:28 +0000 (-0400)
Subject: compressor: accept 'none' or '' for none
X-Git-Tag: v12.1.2~46^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5bc9f6dafe1c7ef35b5a624d9c82604aedd89f36;p=ceph.git

compressor: accept 'none' or '' for none

This makes the parse and output methods match up.

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

diff --git a/src/compressor/Compressor.cc b/src/compressor/Compressor.cc
index a1ed5e928f9..e07fc8dde94 100644
--- a/src/compressor/Compressor.cc
+++ b/src/compressor/Compressor.cc
@@ -41,7 +41,7 @@ boost::optional<Compressor::CompressionAlgorithm> Compressor::get_comp_alg_type(
     return COMP_ALG_ZSTD;
   if (s == "lz4")
     return COMP_ALG_LZ4;
-  if (s == "")
+  if (s == "" || s == "none")
     return COMP_ALG_NONE;
 
   return boost::optional<CompressionAlgorithm>();