leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libceph: rename __decode_pool{,_names}() to decode_pool{,_names}()

Browse Source 
To be in line with all the other osdmap decode helpers.

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
Reviewed-by: Alex Elder <elder@linaro.org>
This commit is contained in:
Ilya Dryomov 2014-03-21 19:05:27 +02:00 committed by Sage Weil
parent 53bbaba9d8
commit 0f70c7eedb
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
net/ceph/osdmap.c
View File

@ -506,7 +506,7 @@ static void __remove_pg_pool(struct rb_root *root, struct ceph_pg_pool_info *pi)
kfree(pi); kfree(pi);
} }
static int __decode_pool(void **p, void *end, struct ceph_pg_pool_info *pi) static int decode_pool(void **p, void *end, struct ceph_pg_pool_info *pi)
{ {
u8 ev, cv; u8 ev, cv;
unsigned len, num; unsigned len, num;
@ -587,7 +587,7 @@ bad:
return -EINVAL; return -EINVAL;
} }
static int __decode_pool_names(void **p, void *end, struct ceph_osdmap *map) static int decode_pool_names(void **p, void *end, struct ceph_osdmap *map)
{ {
struct ceph_pg_pool_info *pi; struct ceph_pg_pool_info *pi;
u32 num, len; u32 num, len;
@ -723,7 +723,7 @@ static int osdmap_decode(void **p, void *end, struct ceph_osdmap *map)
goto bad; goto bad;
} }
pi->id = ceph_decode_64(p); pi->id = ceph_decode_64(p);
err = __decode_pool(p, end, pi); err = decode_pool(p, end, pi);
if (err < 0) { if (err < 0) {
kfree(pi); kfree(pi);
goto bad; goto bad;
@ -731,7 +731,8 @@ static int osdmap_decode(void **p, void *end, struct ceph_osdmap *map)
__insert_pg_pool(&map->pg_pools, pi); __insert_pg_pool(&map->pg_pools, pi);
} }
err = __decode_pool_names(p, end, map); /* pool_name */
err = decode_pool_names(p, end, map);
if (err) if (err)
goto bad; goto bad;
@ -949,12 +950,13 @@ struct ceph_osdmap *osdmap_apply_incremental(void **p, void *end,
pi->id = pool; pi->id = pool;
__insert_pg_pool(&map->pg_pools, pi); __insert_pg_pool(&map->pg_pools, pi);
} }
err = __decode_pool(p, end, pi); err = decode_pool(p, end, pi);
if (err < 0) if (err < 0)
goto bad; goto bad;
} }
err = __decode_pool_names(p, end, map); /* new_pool_names */
err = decode_pool_names(p, end, map);
if (err) if (err)
goto bad; goto bad;