]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: check for -ERR_NOT_MODIFIED in rgw_rest_s3.cc 8379/head
authorNathan Cutler <ncutler@suse.com>
Wed, 15 Jun 2016 14:53:16 +0000 (16:53 +0200)
committerVicente Cheng <freeze.bilsted@gmail.com>
Mon, 20 Jun 2016 02:53:07 +0000 (10:53 +0800)
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

index 72e1fe135dde09560e7e074a31968379fe3cf26e..55767859d7c99ca088a28f9b0792f9af4ec8717d 100644 (file)
@@ -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)