From 24cc4f9e67d9c61f68ccc8f7d80ac227d67aeda1 Mon Sep 17 00:00:00 2001
From: Nathan Cutler <ncutler@suse.com>
Date: Wed, 15 Jun 2016 16:53:16 +0200
Subject: [PATCH] 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
---
 src/rgw/rgw_rest_s3.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc
index 72e1fe135dde..55767859d7c9 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)
-- 
2.47.3