-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
* GPL HEADER START
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
/*
* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
- */
-/*
- * Copyright (c) 2011 Whamcloud, Inc.
+ *
+ * Copyright (c) 2011, 2012, Whamcloud, Inc.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
* Author: Wang Di <wangdi@clusterfs.com>
*/
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
#define DEBUG_SUBSYSTEM S_MDS
#include <linux/module.h>
mdd->mdd_child = lu2dt_dev(next);
/* Prepare transactions callbacks. */
- mdd->mdd_txn_cb.dtc_txn_start = mdd_txn_start_cb;
+ mdd->mdd_txn_cb.dtc_txn_start = NULL;
mdd->mdd_txn_cb.dtc_txn_stop = mdd_txn_stop_cb;
mdd->mdd_txn_cb.dtc_txn_commit = NULL;
mdd->mdd_txn_cb.dtc_cookie = mdd;
if (m->mdd_obd_dev)
mdd_fini_obd(env, m, cfg);
orph_index_fini(env, m);
+ if (m->mdd_capa != NULL) {
+ lu_object_put(env, &m->mdd_capa->do_lu);
+ m->mdd_capa = NULL;
+ }
/* remove upcall device*/
md_upcall_fini(&m->mdd_md_dev);
EXIT;
time. In case of crash, we just restart with old log so we're
allright. */
if (endrec == cur) {
+ /* XXX: transaction is started by llog itself */
rc = mdd_changelog_write_header(mdd, CLM_PURGE);
if (rc)
goto out;
changed since the last purge) */
mdd->mdd_cl.mc_starttime = cfs_time_current_64();
+ /* XXX: transaction is started by llog itself */
rc = llog_cancel(ctxt, NULL, 1, (struct llog_cookie *)&endrec, 0);
out:
llog_ctxt_put(ctxt);
/* Status and action flags */
rec->cr.cr_markerflags = mdd->mdd_cl.mc_flags | markerflags;
+ /* XXX: transaction is started by llog itself */
rc = (mdd->mdd_cl.mc_mask & (1 << CL_MARK)) ?
mdd_changelog_llog_write(mdd, rec, NULL) : 0;
return 0;
}
-static int dot_lustre_mdd_attr_get(const struct lu_env *env,
- struct md_object *obj, struct md_attr *ma)
-{
- struct mdd_object *mdd_obj = md2mdd_obj(obj);
-
- return mdd_attr_get_internal_locked(env, mdd_obj, ma);
-}
-
-static int dot_lustre_mdd_attr_set(const struct lu_env *env,
- struct md_object *obj,
- const struct md_attr *ma)
-{
- return -EPERM;
-}
-
static int dot_lustre_mdd_xattr_get(const struct lu_env *env,
struct md_object *obj, struct lu_buf *buf,
const char *name)
return -ENOSYS;
}
-static dt_obj_version_t dot_lustre_mdd_version_get(const struct lu_env *env,
- struct md_object *obj)
-{
- return 0;
-}
-
-static void dot_lustre_mdd_version_set(const struct lu_env *env,
- struct md_object *obj,
- dt_obj_version_t version)
-{
- return;
-}
-
static int dot_lustre_mdd_path(const struct lu_env *env, struct md_object *obj,
char *path, int pathlen, __u64 *recno, int *linkno)
{
static struct md_object_operations mdd_dot_lustre_obj_ops = {
.moo_permission = dot_lustre_mdd_permission,
- .moo_attr_get = dot_lustre_mdd_attr_get,
- .moo_attr_set = dot_lustre_mdd_attr_set,
+ .moo_attr_get = mdd_attr_get,
+ .moo_attr_set = mdd_attr_set,
.moo_xattr_get = dot_lustre_mdd_xattr_get,
.moo_xattr_list = dot_lustre_mdd_xattr_list,
.moo_xattr_set = dot_lustre_mdd_xattr_set,
.moo_close = dot_lustre_mdd_close,
.moo_capa_get = mdd_capa_get,
.moo_object_sync = dot_lustre_mdd_object_sync,
- .moo_version_get = dot_lustre_mdd_version_get,
- .moo_version_set = dot_lustre_mdd_version_set,
.moo_path = dot_lustre_mdd_path,
.moo_file_lock = dot_file_lock,
.moo_file_unlock = dot_file_unlock,
/* "fid" is a virtual object and hence does not have any "real"
* attributes. So we reuse attributes of .lustre for "fid" dir */
ma->ma_need |= MA_INODE;
- rc = dot_lustre_mdd_attr_get(env, &mdd->mdd_dot_lustre->mod_obj,
- ma);
+ rc = mdd_attr_get(env, &mdd->mdd_dot_lustre->mod_obj, ma);
if (rc)
return rc;
ma->ma_valid |= MA_INODE;
return -EPERM;
}
+static int obf_xattr_list(const struct lu_env *env,
+ struct md_object *obj, struct lu_buf *buf)
+{
+ return 0;
+}
+
static int obf_xattr_get(const struct lu_env *env,
struct md_object *obj, struct lu_buf *buf,
const char *name)
return 0;
}
+static int obf_xattr_set(const struct lu_env *env,
+ struct md_object *obj,
+ const struct lu_buf *buf, const char *name,
+ int fl)
+{
+ return -EPERM;
+}
+
+static int obf_xattr_del(const struct lu_env *env,
+ struct md_object *obj,
+ const char *name)
+{
+ return -EPERM;
+}
+
static int obf_mdd_open(const struct lu_env *env, struct md_object *obj,
int flags)
{
return -ENOSYS;
}
+static dt_obj_version_t obf_version_get(const struct lu_env *env,
+ struct md_object *obj)
+{
+ return 0;
+}
+
static struct md_object_operations mdd_obf_obj_ops = {
- .moo_attr_get = obf_attr_get,
- .moo_attr_set = obf_attr_set,
- .moo_xattr_get = obf_xattr_get,
- .moo_open = obf_mdd_open,
- .moo_close = obf_mdd_close,
- .moo_readpage = obf_mdd_readpage,
- .moo_path = obf_path
+ .moo_attr_get = obf_attr_get,
+ .moo_attr_set = obf_attr_set,
+ .moo_xattr_list = obf_xattr_list,
+ .moo_xattr_get = obf_xattr_get,
+ .moo_xattr_set = obf_xattr_set,
+ .moo_xattr_del = obf_xattr_del,
+ .moo_open = obf_mdd_open,
+ .moo_close = obf_mdd_close,
+ .moo_readpage = obf_mdd_readpage,
+ .moo_version_get = obf_version_get,
+ .moo_path = obf_path
};
/**
rc = mdd_init_obd(env, m, cfg);
if (rc) {
- CERROR("lov init error %d \n", rc);
+ CERROR("lov init error %d\n", rc);
GOTO(out, rc);
}
- rc = mdd_txn_init_credits(env, m);
- if (rc)
- break;
mdd_changelog_init(env, m);
break;
struct mdd_device *mdd = lu2mdd_dev(cdev);
struct lu_device *next = &mdd->mdd_child->dd_lu_dev;
struct dt_object *root;
+ struct lu_fid fid;
int rc;
ENTRY;
GOTO(out, rc);
}
+ /* we use capa file to declare llog changes,
+ * will be fixed with new llog in 2.3 */
+ root = dt_store_open(env, mdd->mdd_child, "", CAPA_KEYS, &fid);
+ if (!IS_ERR(root))
+ mdd->mdd_capa = root;
+ else
+ rc = PTR_ERR(root);
+
out:
RETURN(rc);
}
* No permission check is needed.
*/
static int mdd_statfs(const struct lu_env *env, struct md_device *m,
- cfs_kstatfs_t *sfs)
+ struct obd_statfs *sfs)
{
struct mdd_device *mdd = lu2mdd_dev(&m->md_lu_dev);
int rc;
int rc;
ENTRY;
- rc = obd_set_info_async(lov_exp, sizeof(KEY_CAPA_KEY), KEY_CAPA_KEY,
- sizeof(info), &info, NULL);
+ rc = obd_set_info_async(env, lov_exp, sizeof(KEY_CAPA_KEY),
+ KEY_CAPA_KEY, sizeof(info), &info, NULL);
RETURN(rc);
}
RETURN(rc);
}
+int mdd_declare_llog_cancel(const struct lu_env *env, struct mdd_device *mdd,
+ struct thandle *handle)
+{
+ int rc;
+
+
+ /* XXX: this is a temporary solution to declare llog changes
+ * will be fixed in 2.3 with new llog implementation */
+
+ LASSERT(mdd->mdd_capa);
+
+ /* the llog record could be canceled either by modifying
+ * the plain llog's header or by destroying the llog itself
+ * when this record is the last one in it, it can't be known
+ * here, but the catlog's header will also be modified for
+ * the second case, then the first case can be covered and
+ * is no need to declare it */
+
+ /* destroy empty plain log */
+ rc = dt_declare_destroy(env, mdd->mdd_capa, handle);
+ if (rc)
+ return rc;
+
+ /* record the catlog's header if an empty plain log was destroyed */
+ rc = dt_declare_record_write(env, mdd->mdd_capa,
+ sizeof(struct llog_logid_rec), 0, handle);
+ return rc;
+}
+
struct mdd_changelog_user_data {
__u64 mcud_endrec; /**< purge record for this user */
__u64 mcud_minrec; /**< lowest changelog recno still referenced */
__u32 mcud_minid; /**< user id with lowest rec reference */
__u32 mcud_usercount;
int mcud_found:1;
+ struct mdd_device *mcud_mdd;
+ const struct lu_env *mcud_env;
};
#define MCUD_UNREGISTER -1LL
/* Special case: unregister this user */
if (mcud->mcud_endrec == MCUD_UNREGISTER) {
struct llog_cookie cookie;
+ void *th;
+ struct mdd_device *mdd = mcud->mcud_mdd;
+
cookie.lgc_lgl = llh->lgh_id;
cookie.lgc_index = hdr->lrh_index;
+
+ /* XXX This is a workaround for the deadlock of changelog
+ * adding vs. changelog cancelling. LU-81. */
+ th = mdd_trans_create(mcud->mcud_env, mdd);
+ if (IS_ERR(th)) {
+ CERROR("Cannot get thandle\n");
+ RETURN(-ENOMEM);
+ }
+
+ rc = mdd_declare_llog_cancel(mcud->mcud_env, mdd, th);
+ if (rc)
+ GOTO(stop, rc);
+
+ rc = mdd_trans_start(mcud->mcud_env, mdd, th);
+ if (rc)
+ GOTO(stop, rc);
+
rc = llog_cat_cancel_records(llh->u.phd.phd_cat_handle,
1, &cookie);
if (rc == 0)
mcud->mcud_usercount--;
+
+stop:
+ mdd_trans_stop(mcud->mcud_env, mdd, 0, th);
RETURN(rc);
}
RETURN(rc);
}
-static int mdd_changelog_user_purge(struct mdd_device *mdd, int id,
+static int mdd_changelog_user_purge(const struct lu_env *env,
+ struct mdd_device *mdd, int id,
long long endrec)
{
struct mdd_changelog_user_data data;
data.mcud_minrec = 0;
data.mcud_usercount = 0;
data.mcud_endrec = endrec;
+ data.mcud_mdd = mdd;
+ data.mcud_env = env;
cfs_spin_lock(&mdd->mdd_cl.mc_lock);
endrec = mdd->mdd_cl.mc_index;
cfs_spin_unlock(&mdd->mdd_cl.mc_lock);
switch (cmd) {
case OBD_IOC_CHANGELOG_CLEAR: {
struct changelog_setinfo *cs = karg;
- rc = mdd_changelog_user_purge(mdd, cs->cs_id, cs->cs_recno);
+ rc = mdd_changelog_user_purge(env, mdd, cs->cs_id,
+ cs->cs_recno);
RETURN(rc);
}
case OBD_IOC_GET_MNTOPT: {
rc = mdd_changelog_user_register(mdd, &data->ioc_u32_1);
break;
case OBD_IOC_CHANGELOG_DEREG:
- rc = mdd_changelog_user_purge(mdd, data->ioc_u32_1,
+ rc = mdd_changelog_user_purge(env, mdd, data->ioc_u32_1,
MCUD_UNREGISTER);
break;
default:
git://git.whamcloud.com / fs / lustre-release.git / blobdiff