From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Smith Subject: [PATCH 1/2] Make restore_obj() tolerate a preexisting object in the hash Date: Tue, 9 Feb 2010 09:30:03 -0800 Message-ID: <1265736604-24194-2-git-send-email-danms@us.ibm.com> References: <1265736604-24194-1-git-send-email-danms@us.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1265736604-24194-1-git-send-email-danms-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: containers-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: containers-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org To: containers-qjLDD68F18O7TbgM5vRIOg@public.gmane.org List-Id: containers.vger.kernel.org ... 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 --- 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); - /* - * 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