From: root <root@localhost.localdomain>
Date: Sat, 30 Sep 2017 05:51:47 +0000 (+0800)
Subject: rgw: fix radosgw-admin quota enable return value bug
X-Git-Tag: v13.0.1~521^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=edffb0b76f757b798570f6e5162c3c05ab59564f;p=ceph-ci.git

rgw: fix radosgw-admin quota enable return value bug
Fixes: http://tracker.ceph.com/issues/21608

Signed-off-by: baixueyu <baixueyu@inspur.com>
---

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index 2634af23294..712675a76b8 100644
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -7054,9 +7054,9 @@ next:
                        max_size, max_objects, have_max_size, have_max_objects);
     } else if (!user_id.empty()) {
       if (quota_scope == "bucket") {
-        set_user_bucket_quota(opt_cmd, user, user_op, max_size, max_objects, have_max_size, have_max_objects);
+        return set_user_bucket_quota(opt_cmd, user, user_op, max_size, max_objects, have_max_size, have_max_objects);
       } else if (quota_scope == "user") {
-        set_user_quota(opt_cmd, user, user_op, max_size, max_objects, have_max_size, have_max_objects);
+        return set_user_quota(opt_cmd, user, user_op, max_size, max_objects, have_max_size, have_max_objects);
       } else {
         cerr << "ERROR: invalid quota scope specification. Please specify either --quota-scope=bucket, or --quota-scope=user" << std::endl;
         return EINVAL;