* 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/
struct mdd_device *m, struct lustre_cfg *cfg)
{
ENTRY;
- mdd_changelog_fini(env, m);
if (m->mdd_dot_lustre_objs.mdd_obf)
mdd_object_put(env, m->mdd_dot_lustre_objs.mdd_obf);
if (m->mdd_dot_lustre)
" in log "LPX64"\n", hdr->lrh_index, rec->cur_hdr.lrh_index,
rec->cur_id, rec->cur_endrec, llh->lgh_id.lgl_oid);
- cfs_spin_lock(&mdd->mdd_cl.mc_user_lock);
- mdd->mdd_cl.mc_lastuser = rec->cur_id;
- cfs_spin_unlock(&mdd->mdd_cl.mc_user_lock);
+ spin_lock(&mdd->mdd_cl.mc_user_lock);
+ mdd->mdd_cl.mc_lastuser = rec->cur_id;
+ spin_unlock(&mdd->mdd_cl.mc_user_lock);
- return LLOG_PROC_BREAK;
+ return LLOG_PROC_BREAK;
}
static int llog_changelog_cancel_cb(const struct lu_env *env,
{
struct obd_device *obd = mdd2obd_dev(mdd);
struct llog_ctxt *ctxt = NULL, *uctxt = NULL;
- struct lu_fid rfid;
int rc;
OBD_SET_CTXT_MAGIC(&obd->obd_lvfs_ctxt);
obd->obd_lvfs_ctxt.dt = mdd->mdd_bottom;
- rc = dt_root_get(env, mdd->mdd_bottom, &rfid);
- if (rc)
- RETURN(-ENODEV);
-
- changelog_orig_logops = llog_osd_ops;
- changelog_orig_logops.lop_cancel = llog_changelog_cancel;
rc = llog_setup(env, obd, &obd->obd_olg, LLOG_CHANGELOG_ORIG_CTXT,
obd, &changelog_orig_logops);
if (rc) {
if (rc)
GOTO(out_cleanup, rc);
- ctxt->loc_handle->lgh_logops->lop_add = llog_cat_add_rec;
- ctxt->loc_handle->lgh_logops->lop_declare_add =
- llog_cat_declare_add_rec;
-
rc = llog_cat_init_and_process(env, ctxt->loc_handle);
if (rc)
GOTO(out_close, rc);
int rc;
mdd->mdd_cl.mc_index = 0;
- cfs_spin_lock_init(&mdd->mdd_cl.mc_lock);
+ spin_lock_init(&mdd->mdd_cl.mc_lock);
mdd->mdd_cl.mc_starttime = cfs_time_current_64();
mdd->mdd_cl.mc_flags = 0; /* off by default */
mdd->mdd_cl.mc_mask = CHANGELOG_DEFMASK;
- cfs_spin_lock_init(&mdd->mdd_cl.mc_user_lock);
+ spin_lock_init(&mdd->mdd_cl.mc_user_lock);
mdd->mdd_cl.mc_lastuser = 0;
rc = mdd_changelog_llog_init(env, mdd);
mdd2obd_dev(mdd)->obd_name);
rc = -ESRCH;
} else {
- cfs_spin_lock(&mdd->mdd_cl.mc_lock);
- mdd->mdd_cl.mc_flags |= CLM_ON;
- cfs_spin_unlock(&mdd->mdd_cl.mc_lock);
+ spin_lock(&mdd->mdd_cl.mc_lock);
+ mdd->mdd_cl.mc_flags |= CLM_ON;
+ spin_unlock(&mdd->mdd_cl.mc_lock);
rc = mdd_changelog_write_header(env, mdd, CLM_START);
- }
- } else if ((on == 0) && ((mdd->mdd_cl.mc_flags & CLM_ON) == CLM_ON)) {
- LCONSOLE_INFO("%s: changelog off\n",mdd2obd_dev(mdd)->obd_name);
+ }
+ } else if ((on == 0) && ((mdd->mdd_cl.mc_flags & CLM_ON) == CLM_ON)) {
+ LCONSOLE_INFO("%s: changelog off\n",mdd2obd_dev(mdd)->obd_name);
rc = mdd_changelog_write_header(env, mdd, CLM_FINI);
- cfs_spin_lock(&mdd->mdd_cl.mc_lock);
- mdd->mdd_cl.mc_flags &= ~CLM_ON;
- cfs_spin_unlock(&mdd->mdd_cl.mc_lock);
- }
- return rc;
+ spin_lock(&mdd->mdd_cl.mc_lock);
+ mdd->mdd_cl.mc_flags &= ~CLM_ON;
+ spin_unlock(&mdd->mdd_cl.mc_lock);
+ }
+ return rc;
}
/** Remove entries with indicies up to and including \a endrec from the
if (ctxt == NULL)
return -ENXIO;
- cfs_spin_lock(&mdd->mdd_cl.mc_lock);
- cur = (long long)mdd->mdd_cl.mc_index;
- cfs_spin_unlock(&mdd->mdd_cl.mc_lock);
+ spin_lock(&mdd->mdd_cl.mc_lock);
+ cur = (long long)mdd->mdd_cl.mc_index;
+ spin_unlock(&mdd->mdd_cl.mc_lock);
if (endrec > cur)
endrec = cur;
rec->cr_hdr.lrh_len = llog_data_len(sizeof(*rec) + rec->cr.cr_namelen);
rec->cr_hdr.lrh_type = CHANGELOG_REC;
rec->cr.cr_time = cl_time();
- cfs_spin_lock(&mdd->mdd_cl.mc_lock);
+ spin_lock(&mdd->mdd_cl.mc_lock);
rec->cr.cr_index = ++mdd->mdd_cl.mc_index;
- cfs_spin_unlock(&mdd->mdd_cl.mc_lock);
+ spin_unlock(&mdd->mdd_cl.mc_lock);
ctxt = llog_get_context(obd, LLOG_CHANGELOG_ORIG_CTXT);
LASSERT(ctxt);
return -EPERM;
}
+static int dot_lustre_mdd_swap_layouts(const struct lu_env *env,
+ struct md_object *obj1,
+ struct md_object *obj2,
+ __u64 flags)
+{
+ return -EPERM;
+}
+
static int dot_lustre_mdd_readlink(const struct lu_env *env,
struct md_object *obj, struct lu_buf *buf)
{
}
static struct md_object_operations mdd_dot_lustre_obj_ops = {
- .moo_permission = dot_lustre_mdd_permission,
- .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_xattr_del = dot_lustre_mdd_xattr_del,
- .moo_readpage = mdd_readpage,
- .moo_readlink = dot_lustre_mdd_readlink,
- .moo_object_create = dot_lustre_mdd_object_create,
- .moo_ref_add = dot_lustre_mdd_ref_add,
- .moo_ref_del = dot_lustre_mdd_ref_del,
- .moo_open = dot_lustre_mdd_open,
- .moo_close = dot_lustre_mdd_close,
- .moo_capa_get = mdd_capa_get,
- .moo_object_sync = dot_lustre_mdd_object_sync,
- .moo_path = dot_lustre_mdd_path,
- .moo_file_lock = dot_file_lock,
- .moo_file_unlock = dot_file_unlock,
+ .moo_permission = dot_lustre_mdd_permission,
+ .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_xattr_del = dot_lustre_mdd_xattr_del,
+ .moo_swap_layouts = dot_lustre_mdd_swap_layouts,
+ .moo_readpage = mdd_readpage,
+ .moo_readlink = dot_lustre_mdd_readlink,
+ .moo_object_create = dot_lustre_mdd_object_create,
+ .moo_ref_add = dot_lustre_mdd_ref_add,
+ .moo_ref_del = dot_lustre_mdd_ref_del,
+ .moo_open = dot_lustre_mdd_open,
+ .moo_close = dot_lustre_mdd_close,
+ .moo_capa_get = mdd_capa_get,
+ .moo_object_sync = dot_lustre_mdd_object_sync,
+ .moo_path = dot_lustre_mdd_path,
+ .moo_file_lock = dot_file_lock,
+ .moo_file_unlock = dot_file_unlock,
};
const struct lu_name *lname, struct lu_fid *f,
struct md_op_spec *spec)
{
- if (strcmp(lname->ln_name, mdd_obf_dir_name) == 0)
- *f = LU_OBF_FID;
- else
- return -ENOENT;
+ if (strcmp(lname->ln_name, mdd_obf_dir_name) == 0) {
+ *f = LU_OBF_FID;
+ return 0;
+ }
- return 0;
+ return -ENOENT;
}
static mdl_mode_t dot_lustre_mdd_lock_mode(const struct lu_env *env,
{
struct mdd_device *mdd = mdo2mdd(obj);
struct mdd_object *root;
- struct lu_fid rootfid;
int rc = 0;
/*
* in the root
*/
if (strcmp(name, XATTR_NAME_LOV) == 0) {
- rc = dt_root_get(env, mdd->mdd_child, &rootfid);
- if (rc)
- return rc;
- root = mdd_object_find(env, mdd, &rootfid);
+ root = mdd_object_find(env, mdd, &mdd->mdd_local_root_fid);
if (IS_ERR(root))
return PTR_ERR(root);
rc = mdo_xattr_get(env, root, buf, name,
struct dt_object *dt_dot_lustre;
struct lu_fid *fid = &mdd_env_info(env)->mti_fid;
int rc;
+ ENTRY;
rc = create_dot_lustre_dir(env, m);
if (rc)
break;
case LCFG_CLEANUP:
mdd_lfsck_cleanup(env, m);
+ mdd_changelog_fini(env, m);
rc = next->ld_ops->ldo_process_config(env, next, cfg);
lu_dev_del_linkage(d->ld_site, d);
mdd_device_shutdown(env, m, cfg);
struct lu_device *d)
{
struct mdd_device *mdd = lu2mdd_dev(d);
- struct lu_device *next = &mdd->mdd_child->dd_lu_dev;
+ struct lu_device *next;
int rc;
ENTRY;
LASSERT(mdd != NULL);
+ next = &mdd->mdd_child->dd_lu_dev;
/* XXX: orphans handling. */
__mdd_orphan_cleanup(env, mdd);
if (rc)
GOTO(out, rc);
+ rc = dt_root_get(env, mdd->mdd_child, &mdd->mdd_local_root_fid);
+ if (rc != 0)
+ GOTO(out, rc);
+
root = dt_store_open(env, mdd->mdd_child, "", mdd_root_dir_name,
&mdd->mdd_root_fid);
if (!IS_ERR(root)) {
mdd->mdd_capa = root;
+ rc = mdd_changelog_init(env, mdd);
+ if (rc != 0)
+ GOTO(out, rc);
+
rc = mdd_lfsck_setup(env, mdd);
- if (rc) {
+ if (rc != 0)
CERROR("%s: failed to initialize lfsck: rc = %d\n",
mdd2obd_dev(mdd)->obd_name, rc);
- GOTO(out, rc);
- }
- rc = mdd_changelog_init(env, mdd);
GOTO(out, rc);
.o_health_check = mdd_obd_health_check
};
-/* context key constructor/destructor: mdd_ucred_key_init, mdd_ucred_key_fini */
-LU_KEY_INIT_FINI(mdd_ucred, struct md_ucred);
-
-static struct lu_context_key mdd_ucred_key = {
- .lct_tags = LCT_SESSION,
- .lct_init = mdd_ucred_key_init,
- .lct_fini = mdd_ucred_key_fini
-};
-
-struct md_ucred *md_ucred(const struct lu_env *env)
-{
- LASSERT(env->le_ses != NULL);
- return lu_context_key_get(env->le_ses, &mdd_ucred_key);
-}
-EXPORT_SYMBOL(md_ucred);
-
/*
* context key constructor/destructor:
* mdd_capainfo_key_init, mdd_capainfo_key_fini
rec->cur_hdr.lrh_len = sizeof(*rec);
rec->cur_hdr.lrh_type = CHANGELOG_USER_REC;
- cfs_spin_lock(&mdd->mdd_cl.mc_user_lock);
- if (mdd->mdd_cl.mc_lastuser == (unsigned int)(-1)) {
- cfs_spin_unlock(&mdd->mdd_cl.mc_user_lock);
- CERROR("Maximum number of changelog users exceeded!\n");
- GOTO(out, rc = -EOVERFLOW);
- }
- *id = rec->cur_id = ++mdd->mdd_cl.mc_lastuser;
- rec->cur_endrec = mdd->mdd_cl.mc_index;
- cfs_spin_unlock(&mdd->mdd_cl.mc_user_lock);
+ spin_lock(&mdd->mdd_cl.mc_user_lock);
+ if (mdd->mdd_cl.mc_lastuser == (unsigned int)(-1)) {
+ spin_unlock(&mdd->mdd_cl.mc_user_lock);
+ CERROR("Maximum number of changelog users exceeded!\n");
+ GOTO(out, rc = -EOVERFLOW);
+ }
+ *id = rec->cur_id = ++mdd->mdd_cl.mc_lastuser;
+ rec->cur_endrec = mdd->mdd_cl.mc_index;
+ spin_unlock(&mdd->mdd_cl.mc_user_lock);
rc = llog_cat_add(env, ctxt->loc_handle, &rec->cur_hdr, NULL, NULL);
data.mcud_minrec = 0;
data.mcud_usercount = 0;
data.mcud_endrec = endrec;
- cfs_spin_lock(&mdd->mdd_cl.mc_lock);
- endrec = mdd->mdd_cl.mc_index;
- cfs_spin_unlock(&mdd->mdd_cl.mc_lock);
+ spin_lock(&mdd->mdd_cl.mc_lock);
+ endrec = mdd->mdd_cl.mc_index;
+ spin_unlock(&mdd->mdd_cl.mc_lock);
if ((data.mcud_endrec == 0) ||
((data.mcud_endrec > endrec) &&
(data.mcud_endrec != MCUD_UNREGISTER)))
RETURN(0);
}
case OBD_IOC_START_LFSCK: {
- struct lfsck_start *start = karg;
- struct md_lfsck *lfsck = &mdd->mdd_lfsck;
-
- /* Return the kernel service version. */
- /* XXX: version can be used for compatibility in the future. */
- start->ls_version = lfsck->ml_version;
- rc = mdd_lfsck_start(env, lfsck, start);
+ rc = mdd_lfsck_start(env, &mdd->mdd_lfsck,
+ (struct lfsck_start *)karg);
RETURN(rc);
}
case OBD_IOC_STOP_LFSCK: {
- rc = mdd_lfsck_stop(env, &mdd->mdd_lfsck);
+ rc = mdd_lfsck_stop(env, &mdd->mdd_lfsck, false);
+ RETURN(rc);
+ }
+ case OBD_IOC_PAUSE_LFSCK: {
+ rc = mdd_lfsck_stop(env, &mdd->mdd_lfsck, true);
RETURN(rc);
}
}
}
/* type constructor/destructor: mdd_type_init, mdd_type_fini */
-LU_TYPE_INIT_FINI(mdd, &mdd_thread_key, &mdd_ucred_key, &mdd_capainfo_key);
+LU_TYPE_INIT_FINI(mdd, &mdd_thread_key, &mdd_capainfo_key);
const struct md_device_operations mdd_ops = {
.mdo_statfs = mdd_statfs,
if (rc)
return rc;
+ changelog_orig_logops = llog_osd_ops;
+ changelog_orig_logops.lop_cancel = llog_changelog_cancel;
+ changelog_orig_logops.lop_add = llog_cat_add_rec;
+ changelog_orig_logops.lop_declare_add = llog_cat_declare_add_rec;
+
llo_local_obj_register(&llod_capa_key);
llo_local_obj_register(&llod_mdd_orphan);
llo_local_obj_register(&llod_mdd_root);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff