Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-02 10:11:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

libceph: handle non-empty dest in ceph_{oloc,oid}_copy()

Browse Source 
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
This commit is contained in:
Ilya Dryomov 2017-06-05 14:44:59 +02:00
parent f179d3ba8c
commit ca35ffea89
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/ceph/osdmap.c
View File

@ -1547,12 +1547,13 @@ bad:
void ceph_oloc_copy(struct ceph_object_locator *dest, void ceph_oloc_copy(struct ceph_object_locator *dest,
const struct ceph_object_locator *src) const struct ceph_object_locator *src)
{ {
WARN_ON(!ceph_oloc_empty(dest)); ceph_oloc_destroy(dest);
WARN_ON(dest->pool_ns); /* empty() only covers ->pool */
dest->pool = src->pool; dest->pool = src->pool;
if (src->pool_ns) if (src->pool_ns)
dest->pool_ns = ceph_get_string(src->pool_ns); dest->pool_ns = ceph_get_string(src->pool_ns);
else
dest->pool_ns = NULL;
} }
EXPORT_SYMBOL(ceph_oloc_copy); EXPORT_SYMBOL(ceph_oloc_copy);
@ -1565,14 +1566,15 @@ EXPORT_SYMBOL(ceph_oloc_destroy);
void ceph_oid_copy(struct ceph_object_id *dest, void ceph_oid_copy(struct ceph_object_id *dest,
const struct ceph_object_id *src) const struct ceph_object_id *src)
{ {
WARN_ON(!ceph_oid_empty(dest)); ceph_oid_destroy(dest);
if (src->name != src->inline_name) { if (src->name != src->inline_name) {
/* very rare, see ceph_object_id definition */ /* very rare, see ceph_object_id definition */
dest->name = kmalloc(src->name_len + 1, dest->name = kmalloc(src->name_len + 1,
GFP_NOIO | __GFP_NOFAIL); GFP_NOIO | __GFP_NOFAIL);
} else {
dest->name = dest->inline_name;
} }
memcpy(dest->name, src->name, src->name_len + 1); memcpy(dest->name, src->name, src->name_len + 1);
dest->name_len = src->name_len; dest->name_len = src->name_len;
} }