git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit

]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit

author	Gui Hecheng <guihecheng@cmss.chinamobile.com>
	Fri, 2 Jun 2017 02:00:48 +0000 (10:00 +0800)
committer	Gui Hecheng <guihecheng@cmss.chinamobile.com>
	Wed, 14 Jun 2017 08:09:18 +0000 (16:09 +0800)
commit	123321f4790423e276bd50bb4723ee975e669c62
tree	8e565cb7ca1d154acb28712bd9836223a2ddd940	tree \| snapshot
parent	2b4b71821097d1317bfdbf14afd777ace63bf9dc	commit \| diff

rgw_file: fix misuse of make_key_name before make_fhk

The make_fhk calls make_key_name internally.
Also, because this makes the stored fhk and the new constructed fhk
mismatch, we make the assertion check conditional based on versioned
fhk and bump up the version.

Also, we shall safely update the old_key using update_fhk().

Signed-off-by: Gui Hecheng <guihecheng@cmss.chinamobile.com>

src/rgw/rgw_file.cc		diff \| blob \| history
src/rgw/rgw_file.h		diff \| blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom