From: Orit Wasserman <owasserm@redhat.com>
Date: Wed, 20 Jan 2016 16:24:38 +0000 (+0100)
Subject: rgw: fix subuser rm command failure
X-Git-Tag: v0.94.8~2^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d5274a3aeb7cc40f5ac04ac1ffcd6e3fc3019be3;p=ceph.git

rgw: fix subuser rm command failure

Fixes: 14375
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
(cherry picked from commit bbc06e70b49b2917ee63985727cb92724fb99209)
---

diff --git a/src/rgw/rgw_user.cc b/src/rgw/rgw_user.cc
index 3f52c6b0214e..2947fd6204f1 100644
--- a/src/rgw/rgw_user.cc
+++ b/src/rgw/rgw_user.cc
@@ -1351,7 +1351,7 @@ int RGWSubUserPool::execute_remove(RGWUserAdminOpState& op_state,
   }
 
   // always purge all associate keys
-  user->keys.remove_subuser_keys(op_state, &subprocess_msg, defer_user_update);
+  user->keys.remove_subuser_keys(op_state, &subprocess_msg, true);
 
   // remove the subuser from the user info
   subuser_map->erase(siter);