From ab6f784b064a1c0d0cfd8f3cc855a6fb8fc65c5f Mon Sep 17 00:00:00 2001 From: wangdi Date: Fri, 2 Jun 2006 10:06:12 +0000 Subject: [PATCH] Branch: b_new_cmd a typo fix in mdd_rename --- lustre/mdd/mdd_handler.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/lustre/mdd/mdd_handler.c b/lustre/mdd/mdd_handler.c index 2976c85..910b620 100644 --- a/lustre/mdd/mdd_handler.c +++ b/lustre/mdd/mdd_handler.c @@ -540,8 +540,6 @@ mdd_attr_set(const struct lu_context *ctxt, RETURN(rc); } - - static int __mdd_xattr_set(const struct lu_context *ctxt, struct mdd_device *mdd, struct mdd_object *obj, void *buf, @@ -718,12 +716,11 @@ mdd_rename(const struct lu_context *ctxt, struct md_object *src_pobj, if (rc) GOTO(cleanup, rc); - /* - * XXX nikita: huh? What is this? - */ - rc = __mdd_object_destroy(ctxt, mdd_sobj, handle); - if (rc) - GOTO(cleanup, rc); + if (mdd_object_exists(ctxt, &tobj->mo_lu)) { + rc = __mdd_object_destroy(ctxt, mdd_tobj, handle); + if (rc) + GOTO(cleanup, rc); + } cleanup: mdd_rename_unlock(mdd, mdd_spobj, mdd_tpobj, mdd_sobj, mdd_tobj); mdd_trans_stop(ctxt, mdd, handle); -- 1.8.3.1