update sources to v12.1.0

[ceph.git] / ceph / src / rgw / rgw_log.cc

diff --git a/ceph/src/rgw/rgw_log.cc b/ceph/src/rgw/rgw_log.cc
index 153ddb060d708cd55a15b26fadbc357b20bf038d..5f7b14d4bec3d9a113894b3dd127c006a50dccb4 100644 (file)
--- a/ceph/src/rgw/rgw_log.cc
+++ b/ceph/src/rgw/rgw_log.cc
@@ -218,7 +218,7 @@ static void log_usage(struct req_state *s, const string& op_name)
   rgw_usage_data data(bytes_sent, bytes_received);
 
   data.ops = 1;
-  if (!error)
+  if (!s->is_err())
     data.successful_ops = 1;
 
   entry.add(op_name, data);
@@ -381,7 +381,7 @@ int rgw_log_op(RGWRados *store, RGWREST* const rest, struct req_state *s,
   } else
     entry.http_status = "200"; // default
 
-  entry.error_code = s->err.s3_code;
+  entry.error_code = s->err.err_code;
   entry.bucket_id = bucket_id;
 
   bufferlist bl;