From: Pavan Rallabhandi <pavan.rallabhandi@sandisk.com>
Date: Wed, 29 Apr 2015 08:05:29 +0000 (+0530)
Subject: Avoid an extra read on the atomic variable
X-Git-Tag: v9.0.2~100^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F4309%2Fhead;p=ceph.git

Avoid an extra read on the atomic variable

Signed-off-by: Pavan Rallabhandi <pavan.rallabhandi@sandisk.com>
---

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index e57af444b51..a6aaa86ddd4 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -8604,10 +8604,11 @@ librados::Rados* RGWRados::get_rados_handle()
     } else {
       handle_lock.put_read();
       handle_lock.get_write();
-      if (next_rados_handle.read() == num_rados_handles) {
+      uint32_t handle = next_rados_handle.read();
+      if (handle == num_rados_handles) {
         next_rados_handle.set(0);
+        handle = 0;
       }
-      int handle = next_rados_handle.read();
       rados_map[id] = handle;
       next_rados_handle.inc();
       handle_lock.put_write();