#include <lustre_fid.h>
#include "mdd_internal.h"
-const char orph_index_name[] = "PENDING";
+static const char mdd_orphan_index_name[] = "PENDING";
static const char dotdot[] = "..";
enum {
- ORPH_OP_UNLINK,
- ORPH_OP_TRUNCATE
+ ORPH_OP_UNLINK,
};
-#define ORPHAN_FILE_NAME_FORMAT "%016llx:%08x:%08x:%2x"
-#define ORPHAN_FILE_NAME_FORMAT_18 "%llx:%08x"
+/* obsolete after 2.11, needed for upgrades from older 2.x versions */
+#define ORPHAN_FILE_NAME_FORMAT_20 "%016llx:%08x:%08x:%2x"
-static struct dt_key* orph_key_fill(const struct lu_env *env,
- const struct lu_fid *lf, __u32 op)
+static struct dt_key *mdd_orphan_key_fill(const struct lu_env *env,
+ const struct lu_fid *lf)
{
char *key = mdd_env_info(env)->mti_key;
- int rc;
-
- LASSERT(key);
- rc = snprintf(key, NAME_MAX + 1, ORPHAN_FILE_NAME_FORMAT,
- (long long unsigned int)fid_seq(lf),
- fid_oid(lf), fid_ver(lf), op);
- if (rc > 0)
- return (struct dt_key*) key;
- else
- return ERR_PTR(rc);
+
+ LASSERT(key);
+ snprintf(key, sizeof(mdd_env_info(env)->mti_key),
+ DFID_NOBRACE, PFID(lf));
+
+ return (struct dt_key *)key;
}
-static struct dt_key* orph_key_fill_18(const struct lu_env *env,
- const struct lu_fid *lf)
+/* compatibility with orphan files created in versions before 2.11 */
+static struct dt_key *mdd_orphan_key_fill_20(const struct lu_env *env,
+ const struct lu_fid *lf)
{
char *key = mdd_env_info(env)->mti_key;
- int rc;
-
- LASSERT(key);
- rc = snprintf(key, NAME_MAX + 1, ORPHAN_FILE_NAME_FORMAT_18,
- (unsigned long long)fid_seq(lf), fid_oid(lf));
- if (rc > 0)
- return (struct dt_key*) key;
- else
- return ERR_PTR(rc);
-}
-static inline void mdd_orphan_write_lock(const struct lu_env *env,
- struct mdd_device *mdd)
-{
- struct dt_object *dor = mdd->mdd_orphans;
- dt_write_lock(env, dor, MOR_TGT_ORPHAN);
-}
+ LASSERT(key);
+ snprintf(key, sizeof(mdd_env_info(env)->mti_key),
+ ORPHAN_FILE_NAME_FORMAT_20,
+ fid_seq(lf), fid_oid(lf), fid_ver(lf), ORPH_OP_UNLINK);
-static inline void mdd_orphan_write_unlock(const struct lu_env *env,
- struct mdd_device *mdd)
-{
- struct dt_object *dor = mdd->mdd_orphans;
- dt_write_unlock(env, dor);
+ return (struct dt_key *)key;
}
static inline int mdd_orphan_insert_obj(const struct lu_env *env,
struct mdd_device *mdd,
struct mdd_object *obj,
- __u32 op, struct thandle *th)
+ struct thandle *th)
{
- 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);
- struct dt_key *key = orph_key_fill(env, lf, op);
+ 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);
+ 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);
}
-static inline int mdd_orphan_delete_obj(const struct lu_env *env,
- struct mdd_device *mdd ,
- struct dt_key *key,
- struct thandle *th)
-{
- struct dt_object *dor = mdd->mdd_orphans;
-
- return dt_delete(env, dor, key, th);
-}
-
-static inline int mdd_orphan_ref_add(const struct lu_env *env,
- struct mdd_device *mdd,
- struct thandle *th)
-{
- struct dt_object *dor = mdd->mdd_orphans;
- return dt_ref_add(env, dor, th);
-}
-
-static inline int mdd_orphan_ref_del(const struct lu_env *env,
- struct mdd_device *mdd,
- struct thandle *th)
-{
- struct dt_object *dor = mdd->mdd_orphans;
- return dt_ref_del(env, dor, th);
-}
-
-
-int orph_declare_index_insert(const struct lu_env *env,
- struct mdd_object *obj,
+int mdd_orphan_declare_insert(const struct lu_env *env, struct mdd_object *obj,
umode_t mode, struct thandle *th)
{
- struct dt_insert_rec *rec = &mdd_env_info(env)->mti_dt_rec;
- struct mdd_device *mdd = mdo2mdd(&obj->mod_obj);
- struct dt_key *key;
- int rc;
+ struct dt_insert_rec *rec = &mdd_env_info(env)->mti_dt_rec;
+ struct mdd_device *mdd = mdo2mdd(&obj->mod_obj);
+ struct dt_key *key;
+ int rc;
- key = orph_key_fill(env, mdo2fid(obj), ORPH_OP_UNLINK);
+ key = mdd_orphan_key_fill(env, mdo2fid(obj));
rec->rec_fid = mdo2fid(obj);
rec->rec_type = mode;
return rc;
}
-static int orph_index_insert(const struct lu_env *env,
- struct mdd_object *obj,
- __u32 op, struct thandle *th)
+/**
+ * add an orphan \a obj to the orphan index.
+ * \param obj file or directory.
+ * \param th transaction for index insert.
+ *
+ * \pre obj nlink == 0 && obj->mod_count != 0
+ *
+ * \retval 0 success
+ * \retval -ve index operation error.
+ */
+int mdd_orphan_insert(const struct lu_env *env, struct mdd_object *obj,
+ struct thandle *th)
{
- struct mdd_device *mdd = mdo2mdd(&obj->mod_obj);
- struct dt_object *dor = mdd->mdd_orphans;
- const struct lu_fid *lf_dor = lu_object_fid(&dor->do_lu);
- struct dt_object *next = mdd_object_child(obj);
- struct dt_insert_rec *rec = &mdd_env_info(env)->mti_dt_rec;
- int rc;
- ENTRY;
+ struct mdd_device *mdd = mdo2mdd(&obj->mod_obj);
+ struct dt_object *dor = mdd->mdd_orphans;
+ const struct lu_fid *lf_dor = lu_object_fid(&dor->do_lu);
+ struct dt_object *next = mdd_object_child(obj);
+ struct dt_insert_rec *rec = &mdd_env_info(env)->mti_dt_rec;
+ int rc;
+ ENTRY;
- LASSERT(mdd_write_locked(env, obj) != 0);
- LASSERT(!(obj->mod_flags & ORPHAN_OBJ));
+ LASSERT(mdd_write_locked(env, obj) != 0);
+ LASSERT(!(obj->mod_flags & ORPHAN_OBJ));
- mdd_orphan_write_lock(env, mdd);
+ dt_write_lock(env, mdd->mdd_orphans, MOR_TGT_ORPHAN);
- rc = mdd_orphan_insert_obj(env, mdd, obj, op, th);
- if (rc)
- GOTO(out, rc);
+ rc = mdd_orphan_insert_obj(env, mdd, obj, th);
+ if (rc)
+ GOTO(out, rc);
- mdo_ref_add(env, obj, th);
- if (!S_ISDIR(mdd_object_type(obj)))
+ mdo_ref_add(env, obj, th);
+ if (!S_ISDIR(mdd_object_type(obj)))
GOTO(out, rc = 0);
- mdo_ref_add(env, obj, th);
- mdd_orphan_ref_add(env, mdd, th);
+ mdo_ref_add(env, obj, th);
+ dt_ref_add(env, mdd->mdd_orphans, th);
- /* try best to fixup directory, dont return errors
- * from here */
- if (!dt_try_as_dir(env, next))
+ /* try best to fixup directory, do not return errors from here */
+ if (!dt_try_as_dir(env, next))
GOTO(out, rc = 0);
dt_delete(env, next, (const struct dt_key *)dotdot, th);
(const struct dt_key *)dotdot, th, 1);
out:
- if (rc == 0)
- obj->mod_flags |= ORPHAN_OBJ;
+ if (rc == 0)
+ obj->mod_flags |= ORPHAN_OBJ;
- mdd_orphan_write_unlock(env, mdd);
+ dt_write_unlock(env, mdd->mdd_orphans);
- RETURN(rc);
+ RETURN(rc);
}
-int orph_declare_index_delete(const struct lu_env *env,
- struct mdd_object *obj,
-
- struct thandle *th)
+int mdd_orphan_declare_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;
+ struct mdd_device *mdd = mdo2mdd(&obj->mod_obj);
+ struct dt_key *key;
+ int rc;
- key = orph_key_fill(env, mdo2fid(obj), ORPH_OP_UNLINK);
+ key = mdd_orphan_key_fill(env, mdo2fid(obj));
rc = dt_declare_delete(env, mdd->mdd_orphans, key, th);
- if (rc)
- return rc;
+ if (rc)
+ return rc;
rc = mdo_declare_ref_del(env, obj, th);
if (rc)
return rc;
}
-static int orph_index_delete(const struct lu_env *env,
- struct mdd_object *obj,
- __u32 op,
- struct thandle *th)
+/**
+ * delete an orphan \a obj from orphan index.
+ * \param obj file or directory.
+ * \param th transaction for index deletion and object destruction.
+ *
+ * \pre obj->mod_count == 0 && ORPHAN_OBJ is set for obj.
+ *
+ * \retval 0 success
+ * \retval -ve index operation error.
+ */
+int mdd_orphan_delete(const struct lu_env *env, struct mdd_object *obj,
+ struct thandle *th)
{
- struct mdd_device *mdd = mdo2mdd(&obj->mod_obj);
- struct dt_object *dor = mdd->mdd_orphans;
- struct dt_key *key;
- int rc;
-
- ENTRY;
+ struct mdd_device *mdd = mdo2mdd(&obj->mod_obj);
+ struct dt_object *dor = mdd->mdd_orphans;
+ struct dt_key *key;
+ int rc;
- LASSERT(mdd_write_locked(env, obj) != 0);
- LASSERT(obj->mod_flags & ORPHAN_OBJ);
- LASSERT(obj->mod_count == 0);
+ ENTRY;
- LASSERT(dor);
+ LASSERT(mdd_write_locked(env, obj) != 0);
+ LASSERT(obj->mod_flags & ORPHAN_OBJ);
+ LASSERT(obj->mod_count == 0);
- key = orph_key_fill(env, mdo2fid(obj), op);
- mdd_orphan_write_lock(env, mdd);
+ LASSERT(dor);
- rc = mdd_orphan_delete_obj(env, mdd, key, th);
+ key = mdd_orphan_key_fill(env, mdo2fid(obj));
+ dt_write_lock(env, mdd->mdd_orphans, MOR_TGT_ORPHAN);
- if (rc == -ENOENT) {
- key = orph_key_fill_18(env, mdo2fid(obj));
- rc = mdd_orphan_delete_obj(env, mdd, key, th);
- }
+ rc = dt_delete(env, mdd->mdd_orphans, key, th);
+ if (rc == -ENOENT) {
+ key = mdd_orphan_key_fill_20(env, mdo2fid(obj));
+ rc = dt_delete(env, mdd->mdd_orphans, key, th);
+ }
- if (!rc) {
- /* lov objects will be destroyed by caller */
- 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);
- }
- obj->mod_flags &= ~ORPHAN_OBJ;
- } else {
- CERROR("could not delete object: rc = %d\n",rc);
- }
+ if (!rc) {
+ /* lov objects will be destroyed by caller */
+ mdo_ref_del(env, obj, th);
+ if (S_ISDIR(mdd_object_type(obj))) {
+ mdo_ref_del(env, obj, th);
+ dt_ref_del(env, mdd->mdd_orphans, 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_orphan_write_unlock(env, mdd);
- RETURN(rc);
+ dt_write_unlock(env, mdd->mdd_orphans);
+ RETURN(rc);
}
-static int orphan_destroy(const struct lu_env *env, struct mdd_object *obj,
- struct dt_key *key)
+static int mdd_orphan_destroy(const struct lu_env *env, struct mdd_object *obj,
+ struct dt_key *key)
{
struct thandle *th = NULL;
struct mdd_device *mdd = mdo2mdd(&obj->mod_obj);
th = mdd_trans_create(env, mdd);
if (IS_ERR(th)) {
- CERROR("Cannot get thandle\n");
- RETURN(PTR_ERR(th));
+ rc = PTR_ERR(th);
+ if (rc != -EINPROGRESS)
+ CERROR("%s: cannot get orphan thandle: rc = %d\n",
+ mdd2obd_dev(mdd)->obd_name, rc);
+ RETURN(rc);
}
- rc = orph_declare_index_delete(env, obj, th);
+ rc = mdd_orphan_declare_delete(env, obj, th);
if (rc)
GOTO(stop, rc);
mdd_write_lock(env, obj, MOR_TGT_CHILD);
if (likely(obj->mod_count == 0)) {
- mdd_orphan_write_lock(env, mdd);
- rc = mdd_orphan_delete_obj(env, mdd, key, th);
+ dt_write_lock(env, mdd->mdd_orphans, MOR_TGT_ORPHAN);
+ rc = dt_delete(env, mdd->mdd_orphans, key, th);
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);
+ dt_ref_del(env, mdd->mdd_orphans, th);
}
rc = mdo_destroy(env, obj, th);
- } else
- CERROR("could not delete object: rc = %d\n", rc);
- mdd_orphan_write_unlock(env, mdd);
+ } else {
+ CERROR("%s: could not delete orphan "DFID": rc = %d\n",
+ mdd2obd_dev(mdd)->obd_name, PFID(mdo2fid(obj)),
+ rc);
+ }
+ dt_write_unlock(env, mdd->mdd_orphans);
}
mdd_write_unlock(env, obj);
* \retval 0 success
* \retval -ve error
*/
-static int orph_key_test_and_del(const struct lu_env *env,
- struct mdd_device *mdd, struct lu_fid *lf,
- struct dt_key *key)
+static int mdd_orphan_key_test_and_delete(const struct lu_env *env,
+ struct mdd_device *mdd,
+ struct lu_fid *lf, struct dt_key *key)
{
struct mdd_object *mdo;
int rc;
rc = -EBUSY;
if (mdo->mod_count == 0) {
CDEBUG(D_HA, "Found orphan "DFID", delete it\n", PFID(lf));
- rc = orphan_destroy(env, mdo, key);
+ rc = mdd_orphan_destroy(env, mdo, key);
if (rc) /* so replay-single.sh test_37 works */
- CERROR("%s: error unlinking orphan "DFID" from "
- "PENDING: rc = %d\n",
+ 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);
* \retval 0 success
* \retval -ve error
*/
-static int orph_index_iterate(const struct lu_env *env,
- struct mdd_generic_thread *thread)
+static int mdd_orphan_index_iterate(const struct lu_env *env,
+ struct mdd_generic_thread *thread)
{
struct mdd_device *mdd = (struct mdd_device *)thread->mgt_data;
struct dt_object *dor = mdd->mdd_orphans;
struct lu_dirent *ent = &mdd_env_info(env)->mti_ent;
const struct dt_it_ops *iops;
- struct dt_it *it;
- struct lu_fid fid;
- int key_sz = 0;
- int rc;
- __u64 cookie;
- ENTRY;
-
- iops = &dor->do_index_ops->dio_it;
+ struct dt_it *it;
+ struct lu_fid fid;
+ int key_sz = 0;
+ int rc;
+ __u64 cookie;
+ ENTRY;
+
+ iops = &dor->do_index_ops->dio_it;
it = iops->init(env, dor, LUDA_64BITHASH);
- if (IS_ERR(it)) {
- rc = PTR_ERR(it);
- CERROR("%s: cannot clean PENDING: rc = %d\n",
- mdd2obd_dev(mdd)->obd_name, rc);
- GOTO(out, rc);
- }
+ if (IS_ERR(it)) {
+ rc = PTR_ERR(it);
+ CERROR("%s: cannot clean '%s': rc = %d\n",
+ mdd2obd_dev(mdd)->obd_name, mdd_orphan_index_name, rc);
+ GOTO(out, rc);
+ }
- rc = iops->load(env, it, 0);
- if (rc < 0)
- GOTO(out_put, rc);
- if (rc == 0) {
- CERROR("%s: error loading iterator to clean PENDING\n",
- mdd2obd_dev(mdd)->obd_name);
- /* Index contains no zero key? */
- GOTO(out_put, rc = -EIO);
- }
+ rc = iops->load(env, it, 0);
+ if (rc < 0)
+ GOTO(out_put, rc);
+ if (rc == 0) {
+ CERROR("%s: error loading iterator to clean '%s'\n",
+ mdd2obd_dev(mdd)->obd_name, mdd_orphan_index_name);
+ /* Index contains no zero key? */
+ GOTO(out_put, rc = -EIO);
+ }
do {
if (thread->mgt_abort)
fid_le_to_cpu(&fid, &ent->lde_fid);
if (!fid_is_sane(&fid)) {
- CERROR("%s: bad FID "DFID" cleaning PENDING\n",
- mdd2obd_dev(mdd)->obd_name, PFID(&fid));
+ CERROR("%s: bad FID "DFID" cleaning '%s'\n",
+ mdd2obd_dev(mdd)->obd_name, PFID(&fid),
+ mdd_orphan_index_name);
goto next;
}
/* kill orphan object */
cookie = iops->store(env, it);
iops->put(env, it);
- rc = orph_key_test_and_del(env, mdd, &fid,
- (struct dt_key *)ent->lde_name);
+ rc = mdd_orphan_key_test_and_delete(env, mdd, &fid,
+ (struct dt_key *)ent->lde_name);
/* after index delete reset iterator */
if (rc == 0)
* \retval -ve index operation error.
*
*/
-int orph_index_init(const struct lu_env *env, struct mdd_device *mdd)
+int mdd_orphan_index_init(const struct lu_env *env, struct mdd_device *mdd)
{
- struct lu_fid fid;
- struct dt_object *d;
- int rc = 0;
+ struct lu_fid fid;
+ struct dt_object *d;
+ int rc = 0;
ENTRY;
/* create PENDING dir */
fid_zero(&fid);
rc = mdd_local_file_create(env, mdd, &mdd->mdd_local_root_fid,
- orph_index_name, S_IFDIR | S_IRUGO |
+ mdd_orphan_index_name, S_IFDIR | S_IRUGO |
S_IWUSR | S_IXUGO, &fid);
if (rc < 0)
RETURN(rc);
RETURN(PTR_ERR(d));
LASSERT(lu_object_exists(&d->do_lu));
if (!dt_try_as_dir(env, d)) {
- CERROR("%s: \"%s\" is not an index: rc = %d\n",
- mdd2obd_dev(mdd)->obd_name, orph_index_name, rc);
+ CERROR("%s: orphan dir '%s' is not an index: rc = %d\n",
+ mdd2obd_dev(mdd)->obd_name, mdd_orphan_index_name, rc);
dt_object_put(env, d);
RETURN(-ENOTDIR);
}
RETURN(0);
}
-void orph_index_fini(const struct lu_env *env, struct mdd_device *mdd)
+void mdd_orphan_index_fini(const struct lu_env *env, struct mdd_device *mdd)
{
ENTRY;
if (mdd->mdd_orphans != NULL) {
EXIT;
}
-static int __mdd_orphan_cleanup(void *args)
+static int mdd_orphan_cleanup_thread(void *args)
{
struct mdd_generic_thread *thread = (struct mdd_generic_thread *)args;
- struct lu_env *env = NULL;
- int rc;
+ struct lu_env *env = NULL;
+ int rc;
ENTRY;
complete(&thread->mgt_started);
if (rc)
GOTO(out, rc);
- rc = orph_index_iterate(env, thread);
+ rc = mdd_orphan_index_iterate(env, thread);
lu_env_fini(env);
GOTO(out, rc);
if (name == NULL)
goto out;
- snprintf(name, MTI_NAME_MAXLEN, "orph_cleanup_%s",
- mdd2obd_dev(d)->obd_name);
+ snprintf(name, MTI_NAME_MAXLEN, "orph_%s", mdd2obd_dev(d)->obd_name);
- rc = mdd_generic_thread_start(&d->mdd_orph_cleanup_thread,
- __mdd_orphan_cleanup, (void *)d, name);
+ rc = mdd_generic_thread_start(&d->mdd_orphan_cleanup_thread,
+ mdd_orphan_cleanup_thread, d, name);
out:
if (rc)
- CERROR("%s: start orphan cleanup thread failed:%d\n",
+ CERROR("%s: start orphan cleanup thread failed: rc = %d\n",
mdd2obd_dev(d)->obd_name, rc);
if (name)
OBD_FREE(name, MTI_NAME_MAXLEN);
- return rc;
-}
-
-/**
- * add an orphan \a obj to the orphan index.
- * \param obj file or directory.
- * \param th transaction for index insert.
- *
- * \pre obj nlink == 0 && obj->mod_count != 0
- *
- * \retval 0 success
- * \retval -ve index operation error.
- */
-int __mdd_orphan_add(const struct lu_env *env,
- struct mdd_object *obj, struct thandle *th)
-{
- return orph_index_insert(env, obj, ORPH_OP_UNLINK, th);
-}
-/**
- * delete an orphan \a obj from orphan index.
- * \param obj file or directory.
- * \param th transaction for index deletion and object destruction.
- *
- * \pre obj->mod_count == 0 && ORPHAN_OBJ is set for obj.
- *
- * \retval 0 success
- * \retval -ve index operation error.
- */
-int __mdd_orphan_del(const struct lu_env *env,
- struct mdd_object *obj, struct thandle *th)
-{
- return orph_index_delete(env, obj, ORPH_OP_UNLINK, th);
+ return rc;
}
git://git.whamcloud.com / fs / lustre-release.git / commitdiff