- fixed two missed lmv_obj_put() what cause sinability to free kmem cache later.

diff --git a/lustre/lmv/lmv_intent.c b/lustre/lmv/lmv_intent.c
index db0f7cb..ce9afaf 100644 (file)
--- a/lustre/lmv/lmv_intent.c
+++ b/lustre/lmv/lmv_intent.c
@@ -304,7 +304,6 @@ repeat:
 
         obj = lmv_obj_grab(obd, &body->fid1);
         if (!obj && (mea = lmv_get_mea(*reqp, DLM_REPLY_REC_OFF))) {
-
                 /* FIXME: capability for remote! */
                 /* wow! this is split dir, we'd like to handle it */
                 obj = lmv_obj_create(exp, &body->fid1, mea);
@@ -530,6 +529,10 @@ int lmv_lookup_slaves(struct obd_export *exp, struct ptlrpc_request **reqp)
          * last case possible only if all the objs (master and all slaves aren't
          * valid */
 
+        OBD_ALLOC_PTR(op_data);
+        if (op_data == NULL)
+                RETURN(-ENOMEM);
+
         body = lustre_msg_buf((*reqp)->rq_repmsg,
                               DLM_REPLY_REC_OFF, sizeof(*body));
         LASSERT(body != NULL);
@@ -541,10 +544,6 @@ int lmv_lookup_slaves(struct obd_export *exp, struct ptlrpc_request **reqp)
         CDEBUG(D_OTHER, "lookup slaves for "DFID"\n",
                PFID(&body->fid1));
 
-        OBD_ALLOC_PTR(op_data);
-        if (op_data == NULL)
-                RETURN(-ENOMEM);
-
         lmv_obj_lock(obj);
 
         for (i = 0; i < obj->lo_objcount; i++) {
@@ -571,8 +570,8 @@ int lmv_lookup_slaves(struct obd_export *exp, struct ptlrpc_request **reqp)
                 if (IS_ERR(tgt_exp))
                         GOTO(cleanup, rc = PTR_ERR(tgt_exp));
 
-                rc = md_intent_lock(tgt_exp, op_data, NULL, 0, &it, 0, &req,
-                                    lmv_blocking_ast, 0);
+                rc = md_intent_lock(tgt_exp, op_data, NULL, 0, &it, 0,
+                                    &req, lmv_blocking_ast, 0);
 
                 lockh = (struct lustre_handle *)&it.d.lustre.it_lock_handle;
                 if (rc > 0 && req == NULL) {
@@ -615,9 +614,9 @@ release_lock:
 
         EXIT;
 cleanup:
-        OBD_FREE_PTR(op_data);
         lmv_obj_unlock(obj);
         lmv_obj_put(obj);
+        OBD_FREE_PTR(op_data);
         return rc;
 }
 
@@ -902,7 +901,7 @@ int lmv_revalidate_slaves(struct obd_export *exp, struct ptlrpc_request **reqp,
                 /* is obj valid? */
                 tgt_exp = lmv_get_export(lmv, &fid);
                 if (IS_ERR(tgt_exp))
-                        GOTO(out_free_op_data, rc = PTR_ERR(tgt_exp));
+                        GOTO(cleanup, rc = PTR_ERR(tgt_exp));
 
                 rc = md_intent_lock(tgt_exp, op_data, NULL, 0, &it, 0, &req, cb,
                                     extra_lock_flags);
@@ -964,8 +963,10 @@ release_lock:
         }
 
         if (*reqp) {
-                /* some attrs got refreshed, we have reply and it's time to put
-                 * fresh attrs to it */
+                /*
+                 * Some attrs got refreshed, we have reply and it's time to put
+                 * fresh attrs to it.
+                 */
                 CDEBUG(D_OTHER, "return refreshed attrs: size = %lu\n",
                        (unsigned long)size);
 
@@ -1005,9 +1006,8 @@ release_lock:
 
         EXIT;
 cleanup:
+        OBD_FREE_PTR(op_data);
         lmv_obj_unlock(obj);
         lmv_obj_put(obj);
-out_free_op_data:
-        OBD_FREE_PTR(op_data);
         return rc;
 }

diff --git a/lustre/lmv/lmv_obd.c b/lustre/lmv/lmv_obd.c
index 765fd3c..eb51f28 100644 (file)
--- a/lustre/lmv/lmv_obd.c
+++ b/lustre/lmv/lmv_obd.c
@@ -1535,7 +1535,7 @@ lmv_enqueue(struct obd_export *exp, int lock_type,
                          * name */
                         mds = raw_name2idx(obj->lo_hashtype, obj->lo_objcount,
                                            (char *)op_data->name, op_data->namelen);
-                        op_data->fid1      = obj->lo_inodes[mds].li_fid;
+                        op_data->fid1 = obj->lo_inodes[mds].li_fid;
                         lmv_obj_put(obj);
                 }
         }
@@ -1729,9 +1729,9 @@ static int lmv_rename(struct obd_export *exp, struct md_op_data *op_data,
                 if (obj) {
                         mds = raw_name2idx(obj->lo_hashtype, obj->lo_objcount,
                                            (char *)new, newlen);
-                        op_data->fid2      = obj->lo_inodes[mds].li_fid;
-                        CDEBUG(D_OTHER, "forward to MDS #"LPU64" ("DFID")\n", mds,
-                               PFID(&op_data->fid2));
+                        op_data->fid2 = obj->lo_inodes[mds].li_fid;
+                        CDEBUG(D_OTHER, "forward to MDS #"LPU64" ("DFID")\n",
+                               mds, PFID(&op_data->fid2));
                         lmv_obj_put(obj);
                 }
                 goto request;
@@ -1745,7 +1745,7 @@ static int lmv_rename(struct obd_export *exp, struct md_op_data *op_data,
                  */
                 mds = raw_name2idx(obj->lo_hashtype, obj->lo_objcount,
                                    (char *)old, oldlen);
-                op_data->fid1      = obj->lo_inodes[mds].li_fid;
+                op_data->fid1 = obj->lo_inodes[mds].li_fid;
                 CDEBUG(D_OTHER, "forward to MDS #"LPU64" ("DFID")\n", mds,
                        PFID(&op_data->fid1));
                 lmv_obj_put(obj);
@@ -2120,7 +2120,7 @@ static int lmv_unlink(struct obd_export *exp, struct md_op_data *op_data,
                 if (obj) {
                         i = raw_name2idx(obj->lo_hashtype, obj->lo_objcount,
                                          op_data->name, op_data->namelen);
-                        op_data->fid1      = obj->lo_inodes[i].li_fid;
+                        op_data->fid1 = obj->lo_inodes[i].li_fid;
                         lmv_obj_put(obj);
                         CDEBUG(D_OTHER, "unlink '%*s' in "DFID" -> %u\n",
                                op_data->namelen, op_data->name,