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 (file)
--- 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);
 }