* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2011, 2012, Whamcloud, Inc.
+ * Copyright (c) 2011, 2012, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
int orph_declare_index_insert(const struct lu_env *env,
- struct mdd_object *obj,
- struct thandle *th)
+ struct mdd_object *obj,
+ cfs_umode_t mode, struct thandle *th)
{
- struct mdd_device *mdd = mdo2mdd(&obj->mod_obj);
- int rc;
+ struct mdd_device *mdd = mdo2mdd(&obj->mod_obj);
+ struct dt_key *key;
+ int rc;
- rc = dt_declare_insert(env, mdd->mdd_orphans, NULL, NULL, th);
- if (rc)
- return rc;
+ key = orph_key_fill(env, mdo2fid(obj), ORPH_OP_UNLINK);
- rc = mdo_declare_ref_add(env, obj, th);
- if (rc)
- return rc;
+ rc = dt_declare_insert(env, mdd->mdd_orphans, NULL, key, th);
+ if (rc)
+ return rc;
- if (!S_ISDIR(mdd_object_type(obj)))
- return 0;
+ rc = mdo_declare_ref_add(env, obj, th);
+ if (rc)
+ return rc;
- rc = mdo_declare_ref_add(env, obj, th);
- if (rc)
- return rc;
+ if (!S_ISDIR(mode))
+ return 0;
- rc = dt_declare_ref_add(env, mdd->mdd_orphans, th);
- if (rc)
- return rc;
+ rc = mdo_declare_ref_add(env, obj, th);
+ if (rc)
+ return rc;
- rc = mdo_declare_index_delete(env, obj, dotdot, th);
- if (rc)
- return rc;
+ rc = dt_declare_ref_add(env, mdd->mdd_orphans, th);
+ if (rc)
+ return rc;
- rc = mdo_declare_index_insert(env, obj, NULL, dotdot, th);
+ rc = mdo_declare_index_delete(env, obj, dotdot, th);
+ if (rc)
+ return rc;
- return rc;
+ rc = mdo_declare_index_insert(env, obj, NULL, dotdot, th);
+
+ return rc;
}
static int orph_index_insert(const struct lu_env *env,
LASSERT(mdd_write_locked(env, obj) != 0);
LASSERT(!(obj->mod_flags & ORPHAN_OBJ));
- LASSERT(obj->mod_count > 0);
mdd_orphan_write_lock(env, mdd);
RETURN(rc);
}
-/**
- * Destroy OSD object on MDD and associated OST objects.
- *
- * \param obj orphan object
- * \param mdd used for sending llog msg to osts
- *
- * \retval 0 success
- * \retval -ve error
- */
-static int orphan_object_kill(const struct lu_env *env,
- struct mdd_object *obj,
- struct mdd_device *mdd,
- struct thandle *th)
-{
- struct lu_attr *la = &mdd_env_info(env)->mti_la;
- int rc = 0;
- ENTRY;
-
- /* No need to lock this object as its recovery phase, and
- * no other thread can access it. But we need to lock it
- * as its precondition for osd api we using. */
-
- mdo_ref_del(env, obj, th);
- if (S_ISDIR(mdd_object_type(obj))) {
- mdo_ref_del(env, obj, th);
- mdd_orphan_ref_del(env, mdd, th);
- } else {
- /* regular file , cleanup linked ost objects */
- rc = mdd_la_get(env, obj, la, BYPASS_CAPA);
- if (rc == 0)
- rc = mdd_lov_destroy(env, mdd, obj, la);
- }
- mdo_destroy(env, obj, th);
- RETURN(rc);
-}
-
int orph_declare_index_delete(const struct lu_env *env,
struct mdd_object *obj,
+
struct thandle *th)
{
struct mdd_device *mdd = mdo2mdd(&obj->mod_obj);
+ struct dt_key *key;
int rc;
- rc = dt_declare_delete(env, mdd->mdd_orphans, NULL, th);
+ key = orph_key_fill(env, mdo2fid(obj), ORPH_OP_UNLINK);
+
+ rc = dt_declare_delete(env, mdd->mdd_orphans, key, th);
if (rc)
return rc;
{
struct thandle *th = NULL;
struct mdd_device *mdd = mdo2mdd(&obj->mod_obj);
- struct md_attr *ma = &mdd_env_info(env)->mti_ma;
int rc = 0;
ENTRY;
- /* init ma */
- ma->ma_lmm_size = mdd_lov_mdsize(env, mdd);
- ma->ma_lmm = mdd_max_lmm_get(env, mdd);
- ma->ma_cookie_size = mdd_lov_cookiesize(env, mdd);
- ma->ma_cookie = mdd_max_cookie_get(env, mdd);
- ma->ma_need = MA_INODE | MA_LOV | MA_COOKIE;
- ma->ma_valid = 0;
-
th = mdd_trans_create(env, mdd);
if (IS_ERR(th)) {
CERROR("Cannot get thandle\n");
if (rc)
GOTO(stop, rc);
- rc = mdd_declare_object_kill(env, obj, ma, th);
+ rc = mdo_declare_destroy(env, obj, th);
if (rc)
GOTO(stop, rc);
if (likely(obj->mod_count == 0)) {
mdd_orphan_write_lock(env, mdd);
rc = mdd_orphan_delete_obj(env, mdd, key, th);
- if (rc == 0)
- orphan_object_kill(env, obj, mdd, th);
- else
+ if (rc == 0) {
+ mdo_ref_del(env, obj, th);
+ if (S_ISDIR(mdd_object_type(obj))) {
+ mdo_ref_del(env, obj, th);
+ mdd_orphan_ref_del(env, mdd, th);
+ }
+ rc = mdo_destroy(env, obj, th);
+ } else
CERROR("could not delete object: rc = %d\n",rc);
mdd_orphan_write_unlock(env, mdd);
}
if (rc) /* so replay-single.sh test_37 works */
CERROR("%s: error unlinking orphan "DFID" from "
"PENDING: rc = %d\n",
- mdd->mdd_obd_dev->obd_name, PFID(lf), rc);
+ mdd2obd_dev(mdd)->obd_name, PFID(lf), rc);
} else {
mdd_write_lock(env, mdo, MOR_TGT_CHILD);
if (likely(mdo->mod_count > 0)) {
if (IS_ERR(it)) {
rc = PTR_ERR(it);
CERROR("%s: cannot clean PENDING: rc = %d\n",
- mdd->mdd_obd_dev->obd_name, rc);
+ mdd2obd_dev(mdd)->obd_name, rc);
GOTO(out, rc);
}
GOTO(out_put, rc);
if (rc == 0) {
CERROR("%s: error loading iterator to clean PENDING\n",
- mdd->mdd_obd_dev->obd_name);
+ mdd2obd_dev(mdd)->obd_name);
/* Index contains no zero key? */
GOTO(out_put, rc = -EIO);
}
rc = iops->rec(env, it, (struct dt_rec *)ent, LUDA_64BITHASH);
if (rc != 0) {
CERROR("%s: fail to get FID for orphan it: rc = %d\n",
- mdd->mdd_obd_dev->obd_name, rc);
+ mdd2obd_dev(mdd)->obd_name, rc);
goto next;
}
fid_le_to_cpu(&fid, &ent->lde_fid);
if (!fid_is_sane(&fid)) {
CERROR("%s: bad FID "DFID" cleaning PENDING\n",
- mdd->mdd_obd_dev->obd_name, PFID(&fid));
+ mdd2obd_dev(mdd)->obd_name, PFID(&fid));
goto next;
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff