From 07e7bc3b3da978597907c02b26c5687f8acbb8a0 Mon Sep 17 00:00:00 2001 From: caleb miles Date: Fri, 26 Oct 2012 15:17:05 -0400 Subject: [PATCH] rgw_cache: change call signature to overwrite rgw_rados put_obj_meta() Signed-off-by: caleb miles --- src/rgw/rgw_cache.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/rgw/rgw_cache.h b/src/rgw/rgw_cache.h index 7213b1af507..2f92b8d1946 100644 --- a/src/rgw/rgw_cache.h +++ b/src/rgw/rgw_cache.h @@ -188,7 +188,7 @@ public: int put_obj_meta(void *ctx, rgw_obj& obj, uint64_t size, time_t *mtime, map& attrs, RGWObjCategory category, bool exclusive, map* rmattrs, const bufferlist *data, - RGWObjManifest *manifest); + RGWObjManifest *manifest, const string *ptag); int put_obj_data(void *ctx, rgw_obj& obj, const char *data, off_t ofs, size_t len, bool exclusive); @@ -342,7 +342,8 @@ int RGWCache::set_attrs(void *ctx, rgw_obj& obj, template int RGWCache::put_obj_meta(void *ctx, rgw_obj& obj, uint64_t size, time_t *mtime, map& attrs, RGWObjCategory category, bool exclusive, - map* rmattrs, const bufferlist *data, RGWObjManifest *manifest) + map* rmattrs, const bufferlist *data, + RGWObjManifest *manifest, const string *ptag) { rgw_bucket bucket; string oid; @@ -359,7 +360,7 @@ int RGWCache::put_obj_meta(void *ctx, rgw_obj& obj, uint64_t size, time_t *mt info.flags |= CACHE_FLAG_DATA; } } - int ret = T::put_obj_meta(ctx, obj, size, mtime, attrs, category, exclusive, rmattrs, data, manifest); + int ret = T::put_obj_meta(ctx, obj, size, mtime, attrs, category, exclusive, rmattrs, data, manifest, ptag); if (cacheable) { string name = normal_name(bucket, oid); if (ret >= 0) { -- 2.47.3