1 files changed, 5 insertions, 6 deletions

diff --git a/src/rgw/rgw_log.cc b/src/rgw/rgw_log.cc
index 9bc27bbe9ff..cc7e085ab72 100644
--- a/src/rgw/rgw_log.cc
+++ b/src/rgw/rgw_log.cc
@@ -207,14 +207,14 @@ static void log_usage(req_state *s, const string& op_name)
   bucket_name = s->bucket_name;
 
   if (!bucket_name.empty()) {
-  bucket_name = s->bucket_name;
-    user = s->bucket_owner.get_id();
+    bucket_name = s->bucket_name;
+    user = s->bucket_owner.id;
     if (!rgw::sal::Bucket::empty(s->bucket.get()) &&
 	s->bucket->get_info().requester_pays) {
       payer = s->user->get_id();
     }
   } else {
-      user = s->user->get_id();
+    user = s->user->get_id();
   }
 
   bool error = s->err.is_err();
@@ -647,9 +647,8 @@ int rgw_log_op(RGWREST* const rest, req_state *s, const RGWOp* op, OpsLogSink *o
   }
 
   entry.user = s->user->get_id().to_str();
-  if (s->object_acl)
-    entry.object_owner = s->object_acl->get_owner().get_id();
-  entry.bucket_owner = s->bucket_owner.get_id();
+  entry.object_owner = s->object_acl.get_owner().id;
+  entry.bucket_owner = s->bucket_owner.id;
 
   uint64_t bytes_sent = ACCOUNTING_IO(s)->get_bytes_sent();
   uint64_t bytes_received = ACCOUNTING_IO(s)->get_bytes_received();