From: vitaly <vitaly>
Date: Mon, 25 Sep 2006 22:44:44 +0000 (+0000)
Subject: Branch b_new_cmd
X-Git-Tag: v1_8_0_110~486^2~830
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=0207daeae7f709aac7d58747de78128a3fcca469;p=fs%2Flustre-release.git

Branch b_new_cmd

do not forget to free ost space on unlink
---

diff --git a/lustre/mdd/mdd_handler.c b/lustre/mdd/mdd_handler.c
index 71f735d..17b7c81 100644
--- a/lustre/mdd/mdd_handler.c
+++ b/lustre/mdd/mdd_handler.c
@@ -1450,11 +1450,11 @@ int __mdd_object_kill(const struct lu_context *ctxt,
         ENTRY;
 
         mdd_set_dead_obj(obj);
-        if (S_ISREG(mdd_object_type(obj)) && ma->ma_need&MA_LOV) {
+        if (S_ISREG(mdd_object_type(obj))) {
+                /* Return LOV & COOKIES unconditionally here. We clean evth up.
+                 * Caller must be ready for that. */
                 rc = __mdd_lmm_get(ctxt, obj, ma);
-                if ((ma->ma_valid & MA_LOV) && (ma->ma_need & MA_COOKIE))
-                        rc = mdd_unlink_log(ctxt, mdo2mdd(&obj->mod_obj),
-                                            obj, ma);
+                rc = mdd_unlink_log(ctxt, mdo2mdd(&obj->mod_obj), obj, ma);
         }
         RETURN(rc);
 }