Quoting Dan Smith (danms@xxxxxxxxxx):
> ... as long as the pointer is the same as that returned from the restore
> function. Also move the compulsory ref_drop() so that it only gets
> done if we created the new object.
>
> The existing object tolerance is important for netdev restore because it
> means that I can refer to a peer by its objref instead of needing the
> (previously-rejected) veth_peer() function. If this is not acceptable,
> then I'll need to keep a separate list of pairs.
>
> Signed-off-by: Dan Smith <danms@xxxxxxxxxx>
> ---
> checkpoint/objhash.c | 19 +++++++++++--------
> 1 files changed, 11 insertions(+), 8 deletions(-)
>
> diff --git a/checkpoint/objhash.c b/checkpoint/objhash.c
> index 0b06b06..6051c8d 100644
> --- a/checkpoint/objhash.c
> +++ b/checkpoint/objhash.c
> @@ -1059,16 +1059,19 @@ int restore_obj(struct ckpt_ctx *ctx, struct ckpt_hdr_objref *h)
> if (IS_ERR(ptr))
> return PTR_ERR(ptr);
>
> - if (obj_find_by_objref(ctx, h->objref))
> + obj = obj_find_by_objref(ctx, h->objref);
> + if (obj && (obj->ptr != ptr))
> obj = ERR_PTR(-EINVAL);
> - else
> + else {
> obj = obj_new(ctx, ptr, h->objref, h->objtype);
Sorry, I *must* not be thinking straight, but...
don't you want to do the obj_new only if obj==NULL here? So
if (obj) {
if (obj->ptr != ptr)
return -EINVAL;
else
return obj->objref;
}
obj = obj_new(...)
...
?
> - /*
> - * Drop an extra reference to the object returned by ops->restore:
> - * On success, this clears the extra reference taken by obj_new(),
> - * and on failure, this cleans up the object itself.
> - */
> - ops->ref_drop(ptr, 0);
> + /*
> + * Drop an extra reference to the object returned by
> + * ops->restore: On success, this clears the extra
> + * reference taken by obj_new(), and on failure, this
> + * cleans up the object itself.
> + */
> + ops->ref_drop(ptr, 0);
> + }
> if (IS_ERR(obj)) {
> ops->ref_drop(ptr, 1);
> return PTR_ERR(obj);
> --
> 1.6.2.5
>
> _______________________________________________
> Containers mailing list
> Containers@xxxxxxxxxxxxxxxxxxxxxxxxxx
> https://lists.linux-foundation.org/mailman/listinfo/containers
_______________________________________________
Containers mailing list
Containers@xxxxxxxxxxxxxxxxxxxxxxxxxx
https://lists.linux-foundation.org/mailman/listinfo/containers
