#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 {
{
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;
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);
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)
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)
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);
}
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);
RETURN(rc);
}
- mdd_write_lock(env, obj, MOR_TGT_CHILD);
+ mdd_write_lock(env, obj, DT_TGT_CHILD);
rc = mdd_orphan_declare_delete(env, obj, th);
if (rc == -ENOENT)
orphan_exists = false;
GOTO(unlock, rc);
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 == -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",
- mdd2obd_dev(mdd)->obd_name, PFID(mdo2fid(obj)),
- rc);
+ 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))) {
rc = mdo_destroy(env, obj, th);
} else {
CWARN("%s: orphan %s "DFID" doesn't exist\n",
- mdd2obd_dev(mdd)->obd_name, (char *)key,
- PFID(mdo2fid(obj)));
+ mdd_obj_dev_name(obj), (char *)key,
+ PFID(mdd_object_fid(obj)));
}
dt_write_unlock(env, mdd->mdd_orphans);
}
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);