]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw/rgw_user.cc: use 'true' directly instead of variable
authorDanny Al-Gaaf <danny.al-gaaf@bisect.de>
Tue, 2 Apr 2013 14:17:52 +0000 (16:17 +0200)
committerDanny Al-Gaaf <danny.al-gaaf@bisect.de>
Tue, 2 Apr 2013 14:17:52 +0000 (16:17 +0200)
Instead of passing 'true' via bool defer_user_update variable
in RGWUser::execute_modify() to keys.add() use it directly.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
src/rgw/rgw_user.cc

index 7ba9ae3c3f04a12343e3e9d4c51efbb18520ce0f..8166385e28c9eef9939d0148aa6cc7d2f37a0b94 100644 (file)
@@ -1753,7 +1753,6 @@ int RGWUser::remove(RGWUserAdminOpState& op_state, std::string *err_msg)
 int RGWUser::execute_modify(RGWUserAdminOpState& op_state, std::string *err_msg)
 {
   bool populated = op_state.is_populated();
-  bool defer_user_update = true;
   int ret = 0;
   std::string subprocess_msg;
   std::string op_email = op_state.get_user_email();
@@ -1850,7 +1849,7 @@ int RGWUser::execute_modify(RGWUserAdminOpState& op_state, std::string *err_msg)
 
   // if we're supposed to modify keys, do so
   if (op_state.has_key_op()) {
-    ret = keys.add(op_state, &subprocess_msg, defer_user_update);
+    ret = keys.add(op_state, &subprocess_msg, true);
     if (ret < 0) {
       set_err_msg(err_msg, "unable to create or modify keys, " + subprocess_msg);
       return ret;