From 3228643f1ec34a500246ddc1e16025f05b587342 Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Thu, 3 May 2012 12:50:23 -0700 Subject: [PATCH] rgw: update cache interface for put_obj_meta This fixes issue #2381. The method interface was different than the one needed in order to override the one in RGWRados. Signed-off-by: Yehuda Sadeh Reviewed-by: Sage Weil --- 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 79e544d42c1aa..1d55bb45e10d6 100644 --- a/src/rgw/rgw_cache.h +++ b/src/rgw/rgw_cache.h @@ -195,7 +195,8 @@ public: map* rmattrs); 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); + map* rmattrs, const bufferlist *data, + RGWObjManifest *manifest); int put_obj_data(void *ctx, rgw_obj& obj, const char *data, off_t ofs, size_t len, bool exclusive); @@ -338,7 +339,7 @@ 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) + map* rmattrs, const bufferlist *data, RGWObjManifest *manifest) { rgw_bucket bucket; string oid; @@ -355,7 +356,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); + int ret = T::put_obj_meta(ctx, obj, size, mtime, attrs, category, exclusive, rmattrs, data, manifest); if (cacheable) { string name = normal_name(bucket, oid); if (ret >= 0) { -- 2.39.5