static const char mdd_obf_dir_name[] = "fid";
/* Slab for MDD object allocation */
-cfs_mem_cache_t *mdd_object_kmem;
+struct kmem_cache *mdd_object_kmem;
static struct lu_kmem_descr mdd_caches[] = {
{
spin_lock(&mdd->mdd_cl.mc_user_lock);
mdd->mdd_cl.mc_lastuser = rec->cur_id;
+ if (rec->cur_endrec > mdd->mdd_cl.mc_index)
+ mdd->mdd_cl.mc_index = rec->cur_endrec;
spin_unlock(&mdd->mdd_cl.mc_user_lock);
return LLOG_PROC_BREAK;
GOTO(out, rc = -EINVAL);
}
- if (!fid_is_norm(f) && !fid_is_igif(f) && !fid_is_root(f)) {
+ if (!fid_is_norm(f) && !fid_is_igif(f) && !fid_is_root(f) &&
+ !fid_seq_is_dot(f->f_seq)) {
CWARN("%s: "DFID" is invalid, sequence should be "
">= "LPX64" or within ["LPX64","LPX64"].\n",
mdd2obd_dev(mdd)->obd_name, PFID(f),
return rc;
}
+
+static struct llog_operations hsm_actions_logops;
+
+/**
+ * set llog methods and create LLOG_AGENT_ORIG_CTXT llog
+ * object in obd_device
+ */
+static int mdd_hsm_actions_llog_init(const struct lu_env *env,
+ struct mdd_device *m)
+{
+ struct obd_device *obd = mdd2obd_dev(m);
+ struct llog_ctxt *ctxt = NULL;
+ int rc;
+ ENTRY;
+
+ OBD_SET_CTXT_MAGIC(&obd->obd_lvfs_ctxt);
+ obd->obd_lvfs_ctxt.dt = m->mdd_bottom;
+
+ rc = llog_setup(env, obd, &obd->obd_olg, LLOG_AGENT_ORIG_CTXT,
+ obd, &hsm_actions_logops);
+ if (rc) {
+ CERROR("%s: hsm actions llog setup failed: rc = %d\n",
+ obd->obd_name, rc);
+ RETURN(rc);
+ }
+
+ ctxt = llog_get_context(obd, LLOG_AGENT_ORIG_CTXT);
+ LASSERT(ctxt);
+
+ rc = llog_open_create(env, ctxt, &ctxt->loc_handle, NULL,
+ HSM_ACTIONS);
+ if (rc) {
+ CERROR("%s: hsm actions llog open_create failed: rc = %d\n",
+ obd->obd_name, rc);
+ GOTO(out_cleanup, rc);
+ }
+
+ rc = llog_cat_init_and_process(env, ctxt->loc_handle);
+ if (rc)
+ GOTO(out_close, rc);
+
+ llog_ctxt_put(ctxt);
+ RETURN(0);
+
+out_close:
+ llog_cat_close(env, ctxt->loc_handle);
+ ctxt->loc_handle = NULL;
+out_cleanup:
+ llog_cleanup(env, ctxt);
+
+ return rc;
+}
+
+/**
+ * cleanup the context created by llog_setup_named()
+ */
+static int mdd_hsm_actions_llog_fini(const struct lu_env *env,
+ struct mdd_device *m)
+{
+ struct obd_device *obd = mdd2obd_dev(m);
+ struct llog_ctxt *lctxt;
+ ENTRY;
+
+ lctxt = llog_get_context(obd, LLOG_AGENT_ORIG_CTXT);
+ if (lctxt) {
+ llog_cat_close(env, lctxt->loc_handle);
+ lctxt->loc_handle = NULL;
+ llog_cleanup(env, lctxt);
+ }
+
+ RETURN(0);
+}
+
static void mdd_device_shutdown(const struct lu_env *env, struct mdd_device *m,
struct lustre_cfg *cfg)
{
- mdd_lfsck_cleanup(env, m);
+ lfsck_degister(env, m->mdd_bottom);
+ mdd_hsm_actions_llog_fini(env, m);
mdd_changelog_fini(env, m);
orph_index_fini(env, m);
if (m->mdd_dot_lustre_objs.mdd_obf)
if (rc < 0)
GOTO(out_los, rc);
+ lu_root_fid(&fid);
if (mdd_seq_site(mdd)->ss_node_id == 0) {
- lu_root_fid(&fid);
rc = mdd_local_file_create(env, mdd, &mdd->mdd_local_root_fid,
mdd_root_dir_name, S_IFDIR |
S_IRUGO | S_IWUSR | S_IXUGO, &fid);
mdd2obd_dev(mdd)->obd_name, rc);
GOTO(out_los, rc);
}
- mdd->mdd_root_fid = fid;
+ mdd->mdd_root_fid = fid;
rc = mdd_dot_lustre_setup(env, mdd);
if (rc != 0) {
CERROR("%s: initializing .lustre failed: rc = %d\n",
if (rc)
GOTO(out_los, rc);
+ } else {
+ /* Normal client usually send root access to MDT0 directly,
+ * the root FID on non-MDT0 will only be used by echo client. */
+ mdd->mdd_root_fid = fid;
}
rc = orph_index_init(env, mdd);
GOTO(out_orph, rc);
}
- rc = mdd_lfsck_setup(env, mdd);
+ rc = mdd_hsm_actions_llog_init(env, mdd);
+ if (rc != 0)
+ GOTO(out_changelog, rc);
+
+ rc = lfsck_register(env, mdd->mdd_bottom, mdd->mdd_child, true);
if (rc != 0) {
CERROR("%s: failed to initialize lfsck: rc = %d\n",
mdd2obd_dev(mdd)->obd_name, rc);
- GOTO(out_changelog, rc);
+ GOTO(out_hsm, rc);
}
RETURN(0);
+out_hsm:
+ mdd_hsm_actions_llog_fini(env, mdd);
out_changelog:
mdd_changelog_fini(env, mdd);
out_orph:
out_los:
local_oid_storage_fini(env, mdd->mdd_los);
mdd->mdd_los = NULL;
+
return rc;
}
* No permission check is needed.
*/
static int mdd_statfs(const struct lu_env *env, struct md_device *m,
- struct obd_statfs *sfs)
+ struct obd_statfs *sfs)
{
- struct mdd_device *mdd = lu2mdd_dev(&m->md_lu_dev);
- int rc;
+ struct mdd_device *mdd = lu2mdd_dev(&m->md_lu_dev);
+ int rc;
- ENTRY;
+ ENTRY;
- rc = mdd_child_ops(mdd)->dt_statfs(env, mdd->mdd_child, sfs);
+ rc = mdd_child_ops(mdd)->dt_statfs(env, mdd->mdd_child, sfs);
- RETURN(rc);
+ sfs->os_namelen = min_t(__u32, sfs->os_namelen, NAME_MAX);
+
+ RETURN(rc);
}
/*
RETURN(rc);
}
+static int mdd_maxeasize_get(const struct lu_env *env, struct md_device *m,
+ int *easize)
+{
+ struct mdd_device *mdd = lu2mdd_dev(&m->md_lu_dev);
+ ENTRY;
+
+ *easize = mdd->mdd_dt_conf.ddp_max_ea_size;
+
+ RETURN(0);
+}
+
static int mdd_update_capa_key(const struct lu_env *env,
struct md_device *m,
struct lustre_capa_key *key)
struct mdd_device *m = lu2mdd_dev(lu);
ENTRY;
- LASSERT(cfs_atomic_read(&lu->ld_ref) == 0);
+ LASSERT(atomic_read(&lu->ld_ref) == 0);
md_device_fini(&m->mdd_md_dev);
OBD_FREE_PTR(m);
RETURN(NULL);
RETURN(rc);
}
-static int mdd_obd_health_check(const struct lu_env *env,
- struct obd_device *obd)
+static int mdd_obd_get_info(const struct lu_env *env, struct obd_export *exp,
+ __u32 keylen, void *key, __u32 *vallen, void *val,
+ struct lov_stripe_md *lsm)
{
- struct mdd_device *mdd = lu2mdd_dev(obd->obd_lu_dev);
- int rc;
- ENTRY;
+ int rc = -EINVAL;
+
+ if (KEY_IS(KEY_OSP_CONNECTED)) {
+ struct obd_device *obd = exp->exp_obd;
+ struct mdd_device *mdd;
+
+ if (!obd->obd_set_up || obd->obd_stopping)
+ RETURN(-EAGAIN);
+
+ mdd = lu2mdd_dev(obd->obd_lu_dev);
+ LASSERT(mdd);
+ rc = obd_get_info(env, mdd->mdd_child_exp, keylen, key, vallen,
+ val, lsm);
+ RETURN(rc);
+ }
- LASSERT(mdd);
- rc = obd_health_check(env, mdd->mdd_child_exp->exp_obd);
RETURN(rc);
}
.o_owner = THIS_MODULE,
.o_connect = mdd_obd_connect,
.o_disconnect = mdd_obd_disconnect,
- .o_health_check = mdd_obd_health_check
-};
-
-/*
- * context key constructor/destructor:
- * mdd_capainfo_key_init, mdd_capainfo_key_fini
- */
-LU_KEY_INIT_FINI(mdd_capainfo, struct md_capainfo);
-
-struct lu_context_key mdd_capainfo_key = {
- .lct_tags = LCT_SESSION,
- .lct_init = mdd_capainfo_key_init,
- .lct_fini = mdd_capainfo_key_fini
+ .o_get_info = mdd_obd_get_info,
};
-struct md_capainfo *md_capainfo(const struct lu_env *env)
-{
- /* NB, in mdt_init0 */
- if (env->le_ses == NULL)
- return NULL;
- return lu_context_key_get(env->le_ses, &mdd_capainfo_key);
-}
-EXPORT_SYMBOL(md_capainfo);
-
static int mdd_changelog_user_register(const struct lu_env *env,
struct mdd_device *mdd, int *id)
{
RETURN(0);
}
case OBD_IOC_START_LFSCK: {
- rc = mdd_lfsck_start(env, &mdd->mdd_lfsck,
- (struct lfsck_start *)karg);
+ rc = lfsck_start(env, mdd->mdd_bottom,
+ (struct lfsck_start_param *)karg);
RETURN(rc);
}
case OBD_IOC_STOP_LFSCK: {
- rc = mdd_lfsck_stop(env, &mdd->mdd_lfsck, false);
+ rc = lfsck_stop(env, mdd->mdd_bottom, false);
RETURN(rc);
}
case OBD_IOC_PAUSE_LFSCK: {
- rc = mdd_lfsck_stop(env, &mdd->mdd_lfsck, true);
+ rc = lfsck_stop(env, mdd->mdd_bottom, true);
RETURN(rc);
}
}
}
/* type constructor/destructor: mdd_type_init, mdd_type_fini */
-LU_TYPE_INIT_FINI(mdd, &mdd_thread_key, &mdd_capainfo_key);
+LU_TYPE_INIT_FINI(mdd, &mdd_thread_key);
const struct md_device_operations mdd_ops = {
.mdo_statfs = mdd_statfs,
.mdo_update_capa_key= mdd_update_capa_key,
.mdo_llog_ctxt_get = mdd_llog_ctxt_get,
.mdo_iocontrol = mdd_iocontrol,
+ .mdo_maxeasize_get = mdd_maxeasize_get,
};
static struct lu_device_type_operations mdd_device_type_ops = {
changelog_orig_logops.lop_add = llog_cat_add_rec;
changelog_orig_logops.lop_declare_add = llog_cat_declare_add_rec;
- rc = class_register_type(&mdd_obd_device_ops, NULL, lvars.module_vars,
- LUSTRE_MDD_NAME, &mdd_device_type);
+ hsm_actions_logops = llog_osd_ops;
+ hsm_actions_logops.lop_add = llog_cat_add_rec;
+ hsm_actions_logops.lop_declare_add = llog_cat_declare_add_rec;
+
+ rc = class_register_type(&mdd_obd_device_ops, NULL, NULL,
+#ifndef HAVE_ONLY_PROCFS_SEQ
+ lvars.module_vars,
+#endif
+ LUSTRE_MDD_NAME, &mdd_device_type);
if (rc)
lu_kmem_fini(mdd_caches);
return rc;
git://git.whamcloud.com / fs / lustre-release.git / blobdiff