From: Mark Kogan <mkogan@redhat.com>
Date: Mon, 21 Dec 2020 11:36:16 +0000 (+0200)
Subject: rgw: fix 'this->ondisk_version' will always evaluate to 'true'
X-Git-Tag: v17.0.0~227^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=6fd551b3bfb429231600cbcb26964ad879d4dcf4;p=ceph-ci.git

rgw: fix 'this->ondisk_version' will always evaluate to 'true'

fix:
```
src/rgw/CMakeFiles/radosgw.dir/rgw_rest_metadata.cc.o
../src/rgw/rgw_rest_metadata.cc:267:13: warning: address of
'this->ondisk_version' will always evaluate to 'true'
[-Wpointer-bool-conversion]
                                       &ondisk_version);
```
Fixes: https://tracker.ceph.com/issues/48688

Signed-off-by: Mark Kogan <mkogan@redhat.com>
---

diff --git a/src/rgw/rgw_rest_metadata.cc b/src/rgw/rgw_rest_metadata.cc
index 9f639220285..795382dbc91 100644
--- a/src/rgw/rgw_rest_metadata.cc
+++ b/src/rgw/rgw_rest_metadata.cc
@@ -264,7 +264,7 @@ void RGWOp_Metadata_Put::execute(optional_yield y) {
   }
 
   op_ret = store->ctl()->meta.mgr->put(metadata_key, bl, s->yield, sync_type,
-				       &ondisk_version);
+				       false, &ondisk_version);
   if (op_ret < 0) {
     dout(5) << "ERROR: can't put key: " << cpp_strerror(op_ret) << dendl;
     return;