rgw: fix usage trim call encoding

Fixes: #2841.
Usage trim operation was encoding the wrong op structure (usage read).
Since the structures somewhat overlapped it somewhat worked, but user
info wasn't encoded.

Backport: argonaut
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index e4056c569abdc467e13c50e93a650d458471499d..5676564d6ef787a67309a330b5aa4270be461371 100644 (file)
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -2741,7 +2741,8 @@ int RGWRados::cls_obj_usage_log_trim(string& oid, string& user, uint64_t start_e
     return r;
 
   bufferlist in, out;
-  rgw_cls_usage_log_read_op call;
+  rgw_cls_usage_log_trim_op call;
+  call.user = user;
   call.start_epoch = start_epoch;
   call.end_epoch = end_epoch;
   ::encode(call, in);