On Thu, Mar 27, 2014 at 10:31 PM, Alex Elder <elder@xxxxxxxx> wrote:
> On 03/27/2014 01:18 PM, Ilya Dryomov wrote:
>> Add two helpers to decode primary_affinity (full map, vector<u32>) and
>> new_primary_affinity (inc map, map<u32, u32>) and switch to them.
>
> One comment below, but otherwise looks good.
>
> Reviewed-by: Alex Elder <elder@xxxxxxxxxx>
>
>>
>> Signed-off-by: Ilya Dryomov <ilya.dryomov@xxxxxxxxxxx>
>> ---
>> net/ceph/osdmap.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++
>> 1 file changed, 71 insertions(+)
>>
>> diff --git a/net/ceph/osdmap.c b/net/ceph/osdmap.c
>> index 538b8dd341e8..3ac2098972ea 100644
>> --- a/net/ceph/osdmap.c
>> +++ b/net/ceph/osdmap.c
>> @@ -959,6 +959,59 @@ static int set_primary_affinity(struct ceph_osdmap *map, int osd, u32 aff)
>> return 0;
>> }
>>
>> +static int decode_primary_affinity(void **p, void *end,
>> + struct ceph_osdmap *map)
>> +{
>> + u32 len, i;
>> +
>> + ceph_decode_32_safe(p, end, len, e_inval);
>> + if (len == 0) {
>> + kfree(map->osd_primary_affinity);
>> + map->osd_primary_affinity = NULL;
>> + return 0;
>> + }
>> +
>> + ceph_decode_need(p, end, map->max_osd*sizeof(u32), e_inval);
>> +
>> + BUG_ON(len != map->max_osd);
>
> BUG() here is too much; it should I think just return an error instead.
> The test could be done earlier too, prior to ceph_decode_need().
Moved the test, changed to returning -EINVAL.
Thanks,
Ilya
--
To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
