From: Yan Jun <yan.jun8@zte.com.cn>
Date: Fri, 8 Jul 2016 08:16:55 +0000 (+0800)
Subject: rgw: merge setting flags operation together
X-Git-Tag: ses5-milestone5~187^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cc52749d3bcdee77e9e88b2b7be9187a20a7218b;p=ceph.git

rgw: merge setting flags operation together

Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
---

diff --git a/src/rgw/rgw_cache.h b/src/rgw/rgw_cache.h
index 5fc322634011..f04ced9948bd 100644
--- a/src/rgw/rgw_cache.h
+++ b/src/rgw/rgw_cache.h
@@ -396,9 +396,8 @@ int RGWCache<T>::put_system_obj_impl(rgw_obj& obj, uint64_t size, real_time *mti
   ObjectCacheInfo info;
   info.xattrs = attrs;
   info.status = 0;
-  info.flags = CACHE_FLAG_XATTRS;
   info.data = data;
-  info.flags |= CACHE_FLAG_DATA | CACHE_FLAG_META;
+  info.flags = CACHE_FLAG_XATTRS | CACHE_FLAG_DATA | CACHE_FLAG_META;
   if (objv_tracker) {
     info.version = objv_tracker->write_version;
     info.flags |= CACHE_FLAG_OBJV;
@@ -418,7 +417,7 @@ int RGWCache<T>::put_system_obj_impl(rgw_obj& obj, uint64_t size, real_time *mti
     if (r < 0)
       mydout(0) << "ERROR: failed to distribute cache for " << obj << dendl;
   } else {
-   cache.remove(name);
+    cache.remove(name);
   }
 
   return ret;