rgw: use refrence in read_clear_modified

Signed-off-by: Orit Wasserman <owasserm@redhat.com>

diff --git a/src/rgw/rgw_bucket.cc b/src/rgw/rgw_bucket.cc
index cb8e90b990abb69aa88a87548afc3c04cb6b56ac..b1df3f7d9ca9b308ed731d42ea615ee0ebfca1d1 100644 (file)
--- a/src/rgw/rgw_bucket.cc
+++ b/src/rgw/rgw_bucket.cc
@@ -1608,10 +1608,10 @@ void RGWDataChangesLog::mark_modified(int shard_id, rgw_bucket_shard& bs)
   modified_shards[shard_id].insert(key);
 }
 
-void RGWDataChangesLog::read_clear_modified(map<int, set<string> > *modified)
+void RGWDataChangesLog::read_clear_modified(map<int, set<string> > &modified)
 {
   RWLock::WLocker wl(modified_lock);
-  modified->swap(modified_shards);
+  modified.swap(modified_shards);
   modified_shards.clear();
 }
 

diff --git a/src/rgw/rgw_bucket.h b/src/rgw/rgw_bucket.h
index a5a6763051aa311f1b3fbd755489443584d9d0a9..3ac03e5114152b29aae3b4126b5b5e3ac7f805b7 100644 (file)
--- a/src/rgw/rgw_bucket.h
+++ b/src/rgw/rgw_bucket.h
@@ -483,7 +483,7 @@ public:
                list<rgw_data_change_log_entry>& entries, LogMarker& marker, bool *ptruncated);
 
   void mark_modified(int shard_id, rgw_bucket_shard& bs);
-  void read_clear_modified(map<int, set<string> > *modified);
+  void read_clear_modified(map<int, set<string> > &modified);
 
   bool going_down();
 };

diff --git a/src/rgw/rgw_metadata.cc b/src/rgw/rgw_metadata.cc
index b961aa761b40afb56f9f9c696037d85e8b8a090b..9e263e4dbc08fc60683126bdd720495d8495e825 100644 (file)
--- a/src/rgw/rgw_metadata.cc
+++ b/src/rgw/rgw_metadata.cc
@@ -291,10 +291,10 @@ void RGWMetadataLog::mark_modified(int shard_id)
   modified_shards.insert(shard_id);
 }
 
-void RGWMetadataLog::read_clear_modified(set<int> *modified)
+void RGWMetadataLog::read_clear_modified(set<int> &modified)
 {
   RWLock::WLocker wl(lock);
-  modified->swap(modified_shards);
+  modified.swap(modified_shards);
   modified_shards.clear();
 }
 

diff --git a/src/rgw/rgw_metadata.h b/src/rgw/rgw_metadata.h
index a0bcf463d944dfe3712f221baf762a3dfc2c2f12..58b1f3922cc951370e6c488763be5d59d2082663 100644 (file)
--- a/src/rgw/rgw_metadata.h
+++ b/src/rgw/rgw_metadata.h
@@ -189,7 +189,7 @@ public:
 
   int update_shards(list<int>& shards);
 
-  void read_clear_modified(set<int> *modified);
+  void read_clear_modified(set<int> &modified);
 };
 
 struct LogStatusDump {

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index 72abdd937be386e7c24049b4b2aaf6dc45f7c463..7f102bbf5d565e9494f6055e37605d4d61088a70 100644 (file)
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -2815,7 +2815,7 @@ int RGWMetaNotifier::process()
 
   RGWMetadataLog *log = store->meta_mgr->get_log();
 
-  log->read_clear_modified(&shards);
+  log->read_clear_modified(shards);
 
   if (shards.empty()) {
     return 0;
@@ -2850,7 +2850,7 @@ int RGWDataNotifier::process()
 
   map<int, set<string> > shards;
 
-  store->data_log->read_clear_modified(&shards);
+  store->data_log->read_clear_modified(shards);
 
   if (shards.empty()) {
     return 0;