LU-11668 mdd: use mdd_object_fid() instead of mdo2fid()

[fs/lustre-release.git] / lustre / mdd / mdd_orphans.c

diff --git a/lustre/mdd/mdd_orphans.c b/lustre/mdd/mdd_orphans.c
index 4f6c32c..2652d96 100644 (file)
--- a/lustre/mdd/mdd_orphans.c
+++ b/lustre/mdd/mdd_orphans.c
@@ -45,7 +45,7 @@
 #include <lustre_fid.h>
 #include "mdd_internal.h"
 
-static const char mdd_orphan_index_name[] = "PENDING";
+static const char mdd_orphan_index_name[] = MDT_ORPHAN_DIR;
 static const char dotdot[] = "..";
 
 enum {
@@ -88,13 +88,13 @@ static inline int mdd_orphan_insert_obj(const struct lu_env *env,
 {
        struct dt_insert_rec *rec = &mdd_env_info(env)->mti_dt_rec;
        struct dt_object *dor = mdd->mdd_orphans;
-       const struct lu_fid *lf = mdo2fid(obj);
+       const struct lu_fid *lf = mdd_object_fid(obj);
        struct dt_key *key = mdd_orphan_key_fill(env, lf);
 
        rec->rec_fid = lf;
        rec->rec_type = mdd_object_type(obj);
 
-       return dt_insert(env, dor, (const struct dt_rec *)rec, key, th, 1);
+       return dt_insert(env, dor, (const struct dt_rec *)rec, key, th);
 }
 
 int mdd_orphan_declare_insert(const struct lu_env *env, struct mdd_object *obj,
@@ -105,9 +105,9 @@ int mdd_orphan_declare_insert(const struct lu_env *env, struct mdd_object *obj,
        struct dt_key *key;
        int rc;
 
-       key = mdd_orphan_key_fill(env, mdo2fid(obj));
+       key = mdd_orphan_key_fill(env, mdd_object_fid(obj));
 
-       rec->rec_fid = mdo2fid(obj);
+       rec->rec_fid = mdd_object_fid(obj);
        rec->rec_type = mode;
        rc = dt_declare_insert(env, mdd->mdd_orphans,
                               (const struct dt_rec *)rec, key, th);
@@ -164,7 +164,7 @@ int mdd_orphan_insert(const struct lu_env *env, struct mdd_object *obj,
        LASSERT(mdd_write_locked(env, obj) != 0);
        LASSERT(!(obj->mod_flags & ORPHAN_OBJ));
 
-       dt_write_lock(env, mdd->mdd_orphans, MOR_TGT_ORPHAN);
+       dt_write_lock(env, mdd->mdd_orphans, DT_TGT_ORPHAN);
 
        rc = mdd_orphan_insert_obj(env, mdd, obj, th);
        if (rc)
@@ -186,7 +186,7 @@ int mdd_orphan_insert(const struct lu_env *env, struct mdd_object *obj,
        rec->rec_fid = lf_dor;
        rec->rec_type = S_IFDIR;
        dt_insert(env, next, (const struct dt_rec *)rec,
-                 (const struct dt_key *)dotdot, th, 1);
+                 (const struct dt_key *)dotdot, th);
 
 out:
        if (rc == 0)
@@ -204,12 +204,15 @@ int mdd_orphan_declare_delete(const struct lu_env *env, struct mdd_object *obj,
        struct dt_key *key;
        int rc;
 
-       key = mdd_orphan_key_fill(env, mdo2fid(obj));
+       key = mdd_orphan_key_fill(env, mdd_object_fid(obj));
 
        rc = dt_declare_delete(env, mdd->mdd_orphans, key, th);
        if (rc)
                return rc;
 
+       if (!mdd_object_exists(obj))
+               return -ENOENT;
+
         rc = mdo_declare_ref_del(env, obj, th);
         if (rc)
                 return rc;
@@ -241,7 +244,7 @@ int mdd_orphan_delete(const struct lu_env *env, struct mdd_object *obj,
        struct mdd_device *mdd = mdo2mdd(&obj->mod_obj);
        struct dt_object *dor = mdd->mdd_orphans;
        struct dt_key *key;
-       int rc;
+       int rc = 0;
 
        ENTRY;
 
@@ -251,15 +254,19 @@ int mdd_orphan_delete(const struct lu_env *env, struct mdd_object *obj,
 
        LASSERT(dor);
 
-       key = mdd_orphan_key_fill(env, mdo2fid(obj));
-       dt_write_lock(env, mdd->mdd_orphans, MOR_TGT_ORPHAN);
+       key = mdd_orphan_key_fill(env, mdd_object_fid(obj));
+       dt_write_lock(env, mdd->mdd_orphans, DT_TGT_ORPHAN);
+
+       if (OBD_FAIL_CHECK(OBD_FAIL_MDS_ORPHAN_DELETE))
+               goto ref_del;
 
        rc = dt_delete(env, mdd->mdd_orphans, key, th);
        if (rc == -ENOENT) {
-               key = mdd_orphan_key_fill_20(env, mdo2fid(obj));
+               key = mdd_orphan_key_fill_20(env, mdd_object_fid(obj));
                rc = dt_delete(env, mdd->mdd_orphans, key, th);
        }
 
+ref_del:
        if (!rc) {
                /* lov objects will be destroyed by caller */
                mdo_ref_del(env, obj, th);
@@ -270,7 +277,7 @@ int mdd_orphan_delete(const struct lu_env *env, struct mdd_object *obj,
                obj->mod_flags &= ~ORPHAN_OBJ;
        } else {
                CERROR("%s: could not delete orphan object "DFID": rc = %d\n",
-                      mdd2obd_dev(mdd)->obd_name, PFID(mdo2fid(obj)), rc);
+                      mdd_obj_dev_name(obj), PFID(mdd_object_fid(obj)), rc);
        }
 
        dt_write_unlock(env, mdd->mdd_orphans);
@@ -283,6 +290,7 @@ static int mdd_orphan_destroy(const struct lu_env *env, struct mdd_object *obj,
 {
        struct thandle *th = NULL;
        struct mdd_device *mdd = mdo2mdd(&obj->mod_obj);
+       bool orphan_exists = true;
        int rc = 0;
        ENTRY;
 
@@ -295,23 +303,35 @@ static int mdd_orphan_destroy(const struct lu_env *env, struct mdd_object *obj,
                RETURN(rc);
        }
 
+       mdd_write_lock(env, obj, DT_TGT_CHILD);
        rc = mdd_orphan_declare_delete(env, obj, th);
-       if (rc)
-               GOTO(stop, rc);
-
-       rc = mdo_declare_destroy(env, obj, th);
-       if (rc)
-               GOTO(stop, rc);
+       if (rc == -ENOENT)
+               orphan_exists = false;
+       else if (rc)
+               GOTO(unlock, rc);
+
+       if (orphan_exists) {
+               rc = mdo_declare_destroy(env, obj, th);
+               if (rc)
+                       GOTO(unlock, rc);
+       }
 
        rc = mdd_trans_start(env, mdd, th);
        if (rc)
-               GOTO(stop, rc);
+               GOTO(unlock, rc);
 
-       mdd_write_lock(env, obj, MOR_TGT_CHILD);
        if (likely(obj->mod_count == 0)) {
-               dt_write_lock(env, mdd->mdd_orphans, MOR_TGT_ORPHAN);
+               dt_write_lock(env, mdd->mdd_orphans, DT_TGT_ORPHAN);
                rc = dt_delete(env, mdd->mdd_orphans, key, th);
-               if (rc == 0) {
+               if (rc == -ENOENT) {
+                       key = mdd_orphan_key_fill_20(env, mdd_object_fid(obj));
+                       rc = dt_delete(env, mdd->mdd_orphans, key, th);
+               }
+               if (rc) {
+                       CERROR("%s: could not delete orphan "DFID": rc = %d\n",
+                              mdd_obj_dev_name(obj),
+                              PFID(mdd_object_fid(obj)), rc);
+               } else if (orphan_exists) {
                        mdo_ref_del(env, obj, th);
                        if (S_ISDIR(mdd_object_type(obj))) {
                                mdo_ref_del(env, obj, th);
@@ -319,15 +339,15 @@ static int mdd_orphan_destroy(const struct lu_env *env, struct mdd_object *obj,
                        }
                        rc = mdo_destroy(env, obj, th);
                } else {
-                       CERROR("%s: could not delete orphan "DFID": rc = %d\n",
-                              mdd2obd_dev(mdd)->obd_name, PFID(mdo2fid(obj)),
-                              rc);
+                       CWARN("%s: orphan %s "DFID" doesn't exist\n",
+                             mdd_obj_dev_name(obj), (char *)key,
+                             PFID(mdd_object_fid(obj)));
                }
                dt_write_unlock(env, mdd->mdd_orphans);
        }
+unlock:
        mdd_write_unlock(env, obj);
 
-stop:
        rc = mdd_trans_stop(env, mdd, 0, th);
 
        RETURN(rc);
@@ -359,11 +379,11 @@ static int mdd_orphan_key_test_and_delete(const struct lu_env *env,
        if (mdo->mod_count == 0) {
                CDEBUG(D_HA, "Found orphan "DFID", delete it\n", PFID(lf));
                rc = mdd_orphan_destroy(env, mdo, key);
-               if (rc) /* so replay-single.sh test_37 works */
+               if (rc) /* below message checked in replay-single.sh test_37 */
                        CERROR("%s: error unlinking orphan "DFID": rc = %d\n",
                               mdd2obd_dev(mdd)->obd_name, PFID(lf), rc);
         } else {
-                mdd_write_lock(env, mdo, MOR_TGT_CHILD);
+               mdd_write_lock(env, mdo, DT_TGT_CHILD);
                 if (likely(mdo->mod_count > 0)) {
                         CDEBUG(D_HA, "Found orphan "DFID" count %d, skip it\n",
                                PFID(lf), mdo->mod_count);