From: Nathan Cutler <ncutler@suse.com>
Date: Wed, 15 Jun 2016 14:53:16 +0000 (+0200)
Subject: rgw: check for -ERR_NOT_MODIFIED in rgw_rest_s3.cc
X-Git-Tag: v0.94.8~30^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F8379%2Fhead;p=ceph.git

rgw: check for -ERR_NOT_MODIFIED in rgw_rest_s3.cc

Fixes: http://tracker.ceph.com/issues/16327
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit fc38346c596d8b0bc156183970d6a327943cb577)

Conflicts:
	src/rgw/rgw_rest_s3.cc
	  use ret instead of op_ret to check op result
---

diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc
index 72e1fe135dd..55767859d7c 100644
--- a/src/rgw/rgw_rest_s3.cc
+++ b/src/rgw/rgw_rest_s3.cc
@@ -167,7 +167,7 @@ done:
     s->cio->print("%s: %s\r\n", riter->first.c_str(), riter->second.c_str());
   }
 
-  if (ret == ERR_NOT_MODIFIED) {
+  if (ret == -ERR_NOT_MODIFIED) {
       end_header(s, this);
   } else {
       if (!content_type)