From: Sage Weil <sage@redhat.com>
Date: Thu, 6 Aug 2015 13:29:02 +0000 (-0400)
Subject: Merge pull request #5475 from cxwshawn/com-fix
X-Git-Tag: v9.1.0~429
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b63f2afadbc3b4436c936c5a9b62dcd416ea3afe;p=ceph.git

Merge pull request #5475 from cxwshawn/com-fix

rgw_user.h: modify interface comments.

Reviewed-by: Sage Weil <sage@redhat.com>
---

b63f2afadbc3b4436c936c5a9b62dcd416ea3afe
diff --cc src/rgw/rgw_user.h
index 9446332334fc,d5348940926b..93666bd0db03
--- a/src/rgw/rgw_user.h
+++ b/src/rgw/rgw_user.h
@@@ -55,37 -55,17 +55,37 @@@ extern bool rgw_user_is_authenticated(R
   * Save the given user information to storage.
   * Returns: 0 on success, -ERR# on failure.
   */
 -extern int rgw_store_user_info(RGWRados *store, RGWUserInfo& info, RGWUserInfo *old_info,
 -                               RGWObjVersionTracker *objv_tracker, time_t mtime, bool exclusive);
 +extern int rgw_store_user_info(RGWRados *store,
 +                               RGWUserInfo& info,
 +                               RGWUserInfo *old_info,
 +                               RGWObjVersionTracker *objv_tracker,
 +                               time_t mtime,
 +                               bool exclusive,
 +                               map<string, bufferlist> *pattrs = NULL);
 +/**
 + * Save the custom user metadata given in @attrs and delete those in @rmattrs
 + * for user specified in @user_id.
 + * Returns: 0 on success, -ERR# on failure.
 + */
 +extern int rgw_store_user_attrs(RGWRados *store,
 +                                string& user_id,
 +                                map<string, bufferlist>& attrs,
 +                                map<string, bufferlist>* rmattrs,
 +                                RGWObjVersionTracker *objv_tracker);
 +
  /**
-  * Given an email, finds the user info associated with it.
+  * Given an user_id, finds the user info associated with it.
   * returns: 0 on success, -ERR# on failure (including nonexistence)
   */
 -extern int rgw_get_user_info_by_uid(RGWRados *store, string& user_id, RGWUserInfo& info,
 -                                    RGWObjVersionTracker *objv_tracker = NULL, time_t *pmtime = NULL,
 -                                    rgw_cache_entry_info *cache_info = NULL);
 +extern int rgw_get_user_info_by_uid(RGWRados *store,
 +                                    string& user_id,
 +                                    RGWUserInfo& info,
 +                                    RGWObjVersionTracker *objv_tracker = NULL,
 +                                    time_t *pmtime                     = NULL,
 +                                    rgw_cache_entry_info *cache_info   = NULL,
 +                                    map<string, bufferlist> *pattrs    = NULL);
  /**
-  * Given an swift username, finds the user info associated with it.
+  * Given an email, finds the user info associated with it.
   * returns: 0 on success, -ERR# on failure (including nonexistence)
   */
  extern int rgw_get_user_info_by_email(RGWRados *store, string& email, RGWUserInfo& info,