From: Yehuda Sadeh <yehuda@inktank.com>
Date: Wed, 1 Aug 2012 20:22:38 +0000 (-0700)
Subject: rgw: fix usage trim call encoding
X-Git-Tag: v0.48.1argonaut~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d4849f2f8a8c213c266658467bc5f22763010bc2;p=ceph.git

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 e4056c569ab..5676564d6ef 100644
--- 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);