From: wangdi <wangdi>
Date: Sun, 22 Oct 2006 05:33:35 +0000 (+0000)
Subject: Branch: b_new_cmd
X-Git-Tag: v1_8_0_110~486^2~395
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=e0a6d0be32f8742005b73b7281f12407d629a0d5;p=fs%2Flustre-release.git

Branch: b_new_cmd
 clear MA_LOV | MA_COOKIE, if we do not unlink it. since we get it
 in the begining of unlink for retrieving the lsm_stripe_count for
 unlink credits
---

diff --git a/lustre/mdd/mdd_dir.c b/lustre/mdd/mdd_dir.c
index d1d6fe0..c5c37ce 100644
--- a/lustre/mdd/mdd_dir.c
+++ b/lustre/mdd/mdd_dir.c
@@ -442,6 +442,11 @@ int mdd_finish_unlink(const struct lu_env *env,
 
                 if (obj->mod_count == 0)
                         rc = mdd_object_kill(env, obj, ma);
+                else
+                        /* clear MA_LOV | MA_COOKIE, if we do not 
+                         * unlink it in case we get it somewhere */
+                        ma->ma_valid &= ~(MA_LOV | MA_COOKIE);
+
         }
         RETURN(rc);
 }