X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fmdd%2Fmdd_device.c;h=e3f888911d7f50de13e9f5f33b2953cad67624ad;hp=ac8133a2d12b1a3768e69fb1bfcefd99b65c1eb2;hb=666f6ae30ed7f0c5015f659cd274685a08bd27bc;hpb=b8785c155c81701a6e0d0ef397a347365e7de504 diff --git a/lustre/mdd/mdd_device.c b/lustre/mdd/mdd_device.c index ac8133a..e3f8889 100644 --- a/lustre/mdd/mdd_device.c +++ b/lustre/mdd/mdd_device.c @@ -26,7 +26,7 @@ * GPL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. */ /* @@ -46,7 +46,11 @@ #define DEBUG_SUBSYSTEM S_MDS #include +#ifdef HAVE_EXT4_LDISKFS +#include +#else #include +#endif #include #include #include @@ -55,7 +59,11 @@ #include #include +#ifdef HAVE_EXT4_LDISKFS +#include +#else #include +#endif #include #include #include /* for changelogs */ @@ -87,6 +95,8 @@ static int mdd_device_init(const struct lu_env *env, struct lu_device *d, mdd->mdd_txn_cb.dtc_tag = LCT_MD_THREAD; CFS_INIT_LIST_HEAD(&mdd->mdd_txn_cb.dtc_linkage); mdd->mdd_atime_diff = MAX_ATIME_DIFF; + /* sync permission changes */ + mdd->mdd_sync_permission = 1; rc = mdd_procfs_init(mdd, name); RETURN(rc); @@ -140,11 +150,11 @@ static int changelog_init_cb(struct llog_handle *llh, struct llog_rec_hdr *hdr, CDEBUG(D_INFO, "seeing record at index %d/%d/"LPU64" t=%x %.*s in log "LPX64"\n", - hdr->lrh_index, rec->cr_hdr.lrh_index, rec->cr_index, - rec->cr_type, rec->cr_namelen, rec->cr_name, + hdr->lrh_index, rec->cr_hdr.lrh_index, rec->cr.cr_index, + rec->cr.cr_type, rec->cr.cr_namelen, rec->cr.cr_name, llh->lgh_id.lgl_oid); - mdd->mdd_cl.mc_index = rec->cr_index; + mdd->mdd_cl.mc_index = rec->cr.cr_index; RETURN(LLOG_PROC_BREAK); } @@ -163,9 +173,9 @@ static int changelog_user_init_cb(struct llog_handle *llh, " in log "LPX64"\n", hdr->lrh_index, rec->cur_hdr.lrh_index, rec->cur_id, rec->cur_endrec, llh->lgh_id.lgl_oid); - spin_lock(&mdd->mdd_cl.mc_user_lock); + cfs_spin_lock(&mdd->mdd_cl.mc_user_lock); mdd->mdd_cl.mc_lastuser = rec->cur_id; - spin_unlock(&mdd->mdd_cl.mc_user_lock); + cfs_spin_unlock(&mdd->mdd_cl.mc_user_lock); RETURN(LLOG_PROC_BREAK); } @@ -230,12 +240,11 @@ static int mdd_changelog_init(const struct lu_env *env, struct mdd_device *mdd) int rc; mdd->mdd_cl.mc_index = 0; - spin_lock_init(&mdd->mdd_cl.mc_lock); - cfs_waitq_init(&mdd->mdd_cl.mc_waitq); + cfs_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; - spin_lock_init(&mdd->mdd_cl.mc_user_lock); + cfs_spin_lock_init(&mdd->mdd_cl.mc_user_lock); mdd->mdd_cl.mc_lastuser = 0; rc = mdd_changelog_llog_init(mdd); @@ -265,21 +274,28 @@ int mdd_changelog_on(struct mdd_device *mdd, int on) mdd2obd_dev(mdd)->obd_name); rc = -ESRCH; } else { - spin_lock(&mdd->mdd_cl.mc_lock); + cfs_spin_lock(&mdd->mdd_cl.mc_lock); mdd->mdd_cl.mc_flags |= CLM_ON; - spin_unlock(&mdd->mdd_cl.mc_lock); + cfs_spin_unlock(&mdd->mdd_cl.mc_lock); rc = mdd_changelog_write_header(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); rc = mdd_changelog_write_header(mdd, CLM_FINI); - spin_lock(&mdd->mdd_cl.mc_lock); + cfs_spin_lock(&mdd->mdd_cl.mc_lock); mdd->mdd_cl.mc_flags &= ~CLM_ON; - spin_unlock(&mdd->mdd_cl.mc_lock); + cfs_spin_unlock(&mdd->mdd_cl.mc_lock); } return rc; } +static __u64 cl_time(void) { + cfs_fs_time_t time; + + cfs_fs_time_current(&time); + return (((__u64)time.tv_sec) << 30) + time.tv_nsec; +} + /** Add a changelog entry \a rec to the changelog llog * \param mdd * \param rec @@ -295,19 +311,16 @@ int mdd_changelog_llog_write(struct mdd_device *mdd, struct llog_ctxt *ctxt; int rc; - if ((mdd->mdd_cl.mc_mask & (1 << rec->cr_type)) == 0) - return 0; - - rec->cr_hdr.lrh_len = llog_data_len(sizeof(*rec) + rec->cr_namelen); + rec->cr_hdr.lrh_len = llog_data_len(sizeof(*rec) + rec->cr.cr_namelen); /* llog_lvfs_write_rec sets the llog tail len */ rec->cr_hdr.lrh_type = CHANGELOG_REC; - rec->cr_time = cfs_time_current_64(); - spin_lock(&mdd->mdd_cl.mc_lock); + rec->cr.cr_time = cl_time(); + cfs_spin_lock(&mdd->mdd_cl.mc_lock); /* NB: I suppose it's possible llog_add adds out of order wrt cr_index, but as long as the MDD transactions are ordered correctly for e.g. rename conflicts, I don't think this should matter. */ - rec->cr_index = ++mdd->mdd_cl.mc_index; - spin_unlock(&mdd->mdd_cl.mc_lock); + rec->cr.cr_index = ++mdd->mdd_cl.mc_index; + cfs_spin_unlock(&mdd->mdd_cl.mc_lock); ctxt = llog_get_context(obd, LLOG_CHANGELOG_ORIG_CTXT); if (ctxt == NULL) return -ENXIO; @@ -316,8 +329,6 @@ int mdd_changelog_llog_write(struct mdd_device *mdd, rc = llog_add(ctxt, &rec->cr_hdr, NULL, NULL, 0); llog_ctxt_put(ctxt); - cfs_waitq_signal(&mdd->mdd_cl.mc_waitq); - return rc; } @@ -338,9 +349,9 @@ int mdd_changelog_llog_cancel(struct mdd_device *mdd, long long endrec) if (ctxt == NULL) return -ENXIO; - spin_lock(&mdd->mdd_cl.mc_lock); + cfs_spin_lock(&mdd->mdd_cl.mc_lock); cur = (long long)mdd->mdd_cl.mc_index; - spin_unlock(&mdd->mdd_cl.mc_lock); + cfs_spin_unlock(&mdd->mdd_cl.mc_lock); if (endrec > cur) endrec = cur; @@ -388,17 +399,18 @@ int mdd_changelog_write_header(struct mdd_device *mdd, int markerflags) if (rec == NULL) RETURN(-ENOMEM); - rec->cr_flags = CLF_VERSION; - rec->cr_type = CL_MARK; - rec->cr_namelen = len; - memcpy(rec->cr_name, obd->obd_name, rec->cr_namelen); + rec->cr.cr_flags = CLF_VERSION; + rec->cr.cr_type = CL_MARK; + rec->cr.cr_namelen = len; + memcpy(rec->cr.cr_name, obd->obd_name, rec->cr.cr_namelen); /* Status and action flags */ - rec->cr_markerflags = mdd->mdd_cl.mc_flags | markerflags; + rec->cr.cr_markerflags = mdd->mdd_cl.mc_flags | markerflags; - rc = mdd_changelog_llog_write(mdd, rec, NULL); + rc = (mdd->mdd_cl.mc_mask & (1 << CL_MARK)) ? + mdd_changelog_llog_write(mdd, rec, NULL) : 0; /* assume on or off event; reset repeat-access time */ - mdd->mdd_cl.mc_starttime = rec->cr_time; + mdd->mdd_cl.mc_starttime = cfs_time_current_64(); OBD_FREE(rec, reclen); RETURN(rc); @@ -431,29 +443,85 @@ static int create_dot_lustre_dir(const struct lu_env *env, struct mdd_device *m) return 0; } -static int dot_lustre_attr_get(const struct lu_env *env, struct md_object *obj, - struct md_attr *ma) + +static int dot_lustre_mdd_permission(const struct lu_env *env, + struct md_object *pobj, + struct md_object *cobj, + struct md_attr *attr, int mask) +{ + if (mask & ~(MAY_READ | MAY_EXEC)) + return -EPERM; + else + 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_attr_set(const struct lu_env *env, struct md_object *obj, - const struct md_attr *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 0; +} + +static int dot_lustre_mdd_xattr_list(const struct lu_env *env, + struct md_object *obj, struct lu_buf *buf) +{ + return 0; +} + +static int dot_lustre_mdd_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 dot_lustre_xattr_get(const struct lu_env *env, - struct md_object *obj, struct lu_buf *buf, - const char *name) +static int dot_lustre_mdd_xattr_del(const struct lu_env *env, + struct md_object *obj, + const char *name) +{ + return -EPERM; +} + +static int dot_lustre_mdd_readlink(const struct lu_env *env, + struct md_object *obj, struct lu_buf *buf) { return 0; } -static int dot_lustre_xattr_list(const struct lu_env *env, - struct md_object *obj, struct lu_buf *buf) +static int dot_lustre_mdd_object_create(const struct lu_env *env, + struct md_object *obj, + const struct md_op_spec *spec, + struct md_attr *ma) +{ + return -EPERM; +} + +static int dot_lustre_mdd_ref_add(const struct lu_env *env, + struct md_object *obj, + const struct md_attr *ma) +{ + return -EPERM; +} + +static int dot_lustre_mdd_ref_del(const struct lu_env *env, + struct md_object *obj, + struct md_attr *ma) { return -EPERM; } @@ -470,14 +538,8 @@ static int dot_lustre_mdd_open(const struct lu_env *env, struct md_object *obj, return 0; } -static int dot_lustre_path(const struct lu_env *env, struct md_object *obj, - char *path, int pathlen, __u64 *recno, int *linkno) -{ - return -ENOSYS; -} - -static int dot_lustre_close(const struct lu_env *env, struct md_object *obj, - struct md_attr *ma) +static int dot_lustre_mdd_close(const struct lu_env *env, struct md_object *obj, + struct md_attr *ma) { struct mdd_object *mdd_obj = md2mdd_obj(obj); @@ -488,36 +550,58 @@ static int dot_lustre_close(const struct lu_env *env, struct md_object *obj, return 0; } -static dt_obj_version_t dot_lustre_version_get(const struct lu_env *env, - struct md_object *obj) +static int dot_lustre_mdd_object_sync(const struct lu_env *env, + struct md_object *obj) +{ + 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_version_set(const struct lu_env *env, - struct md_object *obj, - dt_obj_version_t version) +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) +{ + return -ENOSYS; +} + static struct md_object_operations mdd_dot_lustre_obj_ops = { - .moo_attr_get = dot_lustre_attr_get, - .moo_attr_set = dot_lustre_attr_set, - .moo_xattr_get = dot_lustre_xattr_get, - .moo_xattr_list = dot_lustre_xattr_list, - .moo_open = dot_lustre_mdd_open, - .moo_close = dot_lustre_close, - .moo_readpage = mdd_readpage, - .moo_version_get = dot_lustre_version_get, - .moo_version_set = dot_lustre_version_set, - .moo_path = dot_lustre_path + .moo_permission = dot_lustre_mdd_permission, + .moo_attr_get = dot_lustre_mdd_attr_get, + .moo_attr_set = dot_lustre_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_version_get = dot_lustre_mdd_version_get, + .moo_version_set = dot_lustre_mdd_version_set, + .moo_path = dot_lustre_mdd_path, }; -static int dot_lustre_lookup(const struct lu_env *env, struct md_object *p, - const struct lu_name *lname, struct lu_fid *f, - struct md_op_spec *spec) + +static int dot_lustre_mdd_lookup(const struct lu_env *env, struct md_object *p, + 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; @@ -527,45 +611,102 @@ static int dot_lustre_lookup(const struct lu_env *env, struct md_object *p, return 0; } -static int dot_lustre_create(const struct lu_env *env, struct md_object *pobj, - const struct lu_name *lname, - struct md_object *child, struct md_op_spec *spec, - struct md_attr* ma) +static mdl_mode_t dot_lustre_mdd_lock_mode(const struct lu_env *env, + struct md_object *obj, + mdl_mode_t mode) +{ + return MDL_MINMODE; +} + +static int dot_lustre_mdd_create(const struct lu_env *env, + struct md_object *pobj, + const struct lu_name *lname, + struct md_object *child, + struct md_op_spec *spec, + struct md_attr* ma) { return -EPERM; } -static int dot_lustre_rename(const struct lu_env *env, - struct md_object *src_pobj, - struct md_object *tgt_pobj, - const struct lu_fid *lf, - const struct lu_name *lsname, - struct md_object *tobj, - const struct lu_name *ltname, struct md_attr *ma) +static int dot_lustre_mdd_create_data(const struct lu_env *env, + struct md_object *p, + struct md_object *o, + const struct md_op_spec *spec, + struct md_attr *ma) { return -EPERM; } -static int dot_lustre_link(const struct lu_env *env, struct md_object *tgt_obj, - struct md_object *src_obj, - const struct lu_name *lname, struct md_attr *ma) +static int dot_lustre_mdd_rename(const struct lu_env *env, + struct md_object *src_pobj, + struct md_object *tgt_pobj, + const struct lu_fid *lf, + const struct lu_name *lsname, + struct md_object *tobj, + const struct lu_name *ltname, + struct md_attr *ma) { return -EPERM; } -static int dot_lustre_unlink(const struct lu_env *env, struct md_object *pobj, - struct md_object *cobj, const struct lu_name *lname, - struct md_attr *ma) +static int dot_lustre_mdd_link(const struct lu_env *env, + struct md_object *tgt_obj, + struct md_object *src_obj, + const struct lu_name *lname, + struct md_attr *ma) { return -EPERM; } +static int dot_lustre_mdd_unlink(const struct lu_env *env, + struct md_object *pobj, + struct md_object *cobj, + const struct lu_name *lname, + struct md_attr *ma) +{ + return -EPERM; +} + +static int dot_lustre_mdd_name_insert(const struct lu_env *env, + struct md_object *obj, + const struct lu_name *lname, + const struct lu_fid *fid, + const struct md_attr *ma) +{ + return -EPERM; +} + +static int dot_lustre_mdd_name_remove(const struct lu_env *env, + struct md_object *obj, + const struct lu_name *lname, + const struct md_attr *ma) +{ + return -EPERM; +} + +static int dot_lustre_mdd_rename_tgt(const struct lu_env *env, + struct md_object *pobj, + struct md_object *tobj, + const struct lu_fid *fid, + const struct lu_name *lname, + struct md_attr *ma) +{ + return -EPERM; +} + + static struct md_dir_operations mdd_dot_lustre_dir_ops = { - .mdo_lookup = dot_lustre_lookup, - .mdo_create = dot_lustre_create, - .mdo_rename = dot_lustre_rename, - .mdo_link = dot_lustre_link, - .mdo_unlink = dot_lustre_unlink, + .mdo_is_subdir = mdd_is_subdir, + .mdo_lookup = dot_lustre_mdd_lookup, + .mdo_lock_mode = dot_lustre_mdd_lock_mode, + .mdo_create = dot_lustre_mdd_create, + .mdo_create_data = dot_lustre_mdd_create_data, + .mdo_rename = dot_lustre_mdd_rename, + .mdo_link = dot_lustre_mdd_link, + .mdo_unlink = dot_lustre_mdd_unlink, + .mdo_name_insert = dot_lustre_mdd_name_insert, + .mdo_name_remove = dot_lustre_mdd_name_remove, + .mdo_rename_tgt = dot_lustre_mdd_rename_tgt, }; static int obf_attr_get(const struct lu_env *env, struct md_object *obj, @@ -579,7 +720,8 @@ static int obf_attr_get(const struct lu_env *env, struct md_object *obj, /* "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_attr_get(env, &mdd->mdd_dot_lustre->mod_obj, ma); + rc = dot_lustre_mdd_attr_get(env, &mdd->mdd_dot_lustre->mod_obj, + ma); if (rc) return rc; ma->ma_valid |= MA_INODE; @@ -597,9 +739,9 @@ static int obf_attr_get(const struct lu_env *env, struct md_object *obj, return 0; if (ma->ma_need & MA_LOV_DEF) { - rc = mdd_get_default_md(mdd_obj, ma->ma_lmm, - &ma->ma_lmm_size); + rc = mdd_get_default_md(mdd_obj, ma->ma_lmm); if (rc > 0) { + ma->ma_lmm_size = rc; ma->ma_valid |= MA_LOV; rc = 0; } @@ -863,7 +1005,7 @@ static int mdd_lov_set_nextid(const struct lu_env *env, ENTRY; LASSERT(mds->mds_lov_objids != NULL); - rc = obd_set_info_async(mds->mds_osc_exp, strlen(KEY_NEXT_ID), + rc = obd_set_info_async(mds->mds_lov_exp, strlen(KEY_NEXT_ID), KEY_NEXT_ID, mds->mds_lov_desc.ld_tgt_count, mds->mds_lov_objids, NULL); @@ -907,11 +1049,13 @@ static int mdd_recovery_complete(const struct lu_env *env, } #endif /* Call that with obd_recovering = 1 just to update objids */ - obd_notify(obd->u.mds.mds_osc_obd, NULL, (obd->obd_async_recov ? + obd_notify(obd->u.mds.mds_lov_obd, NULL, (obd->obd_async_recov ? OBD_NOTIFY_SYNC_NONBLOCK : OBD_NOTIFY_SYNC), NULL); /* Drop obd_recovering to 0 and call o_postrecov to recover mds_lov */ + cfs_spin_lock(&obd->obd_dev_lock); obd->obd_recovering = 0; + cfs_spin_unlock(&obd->obd_dev_lock); obd->obd_type->typ_dt_ops->o_postrecov(obd); /* XXX: orphans handling. */ @@ -982,7 +1126,7 @@ static int mdd_root_get(const struct lu_env *env, * No permission check is needed. */ static int mdd_statfs(const struct lu_env *env, struct md_device *m, - struct kstatfs *sfs) + cfs_kstatfs_t *sfs) { struct mdd_device *mdd = lu2mdd_dev(&m->md_lu_dev); int rc; @@ -1018,7 +1162,11 @@ static int mdd_init_capa_ctxt(const struct lu_env *env, struct md_device *m, int rc; ENTRY; + /* need barrier for mds_capa_keys access. */ + cfs_down_write(&mds->mds_notify_lock); mds->mds_capa_keys = keys; + cfs_up_write(&mds->mds_notify_lock); + rc = mdd_child_ops(mdd)->dt_init_capa_ctxt(env, mdd->mdd_child, mode, timeout, alg, keys); RETURN(rc); @@ -1030,7 +1178,7 @@ static int mdd_update_capa_key(const struct lu_env *env, { struct mds_capa_info info = { .uuid = NULL, .capa = key }; struct mdd_device *mdd = lu2mdd_dev(&m->md_lu_dev); - struct obd_export *lov_exp = mdd2obd_dev(mdd)->u.mds.mds_osc_exp; + struct obd_export *lov_exp = mdd2obd_dev(mdd)->u.mds.mds_lov_exp; int rc; ENTRY; @@ -1076,7 +1224,7 @@ static struct lu_device *mdd_device_free(const struct lu_env *env, struct lu_device *next = &m->mdd_child->dd_lu_dev; ENTRY; - LASSERT(atomic_read(&lu->ld_ref) == 0); + LASSERT(cfs_atomic_read(&lu->ld_ref) == 0); md_device_fini(&m->mdd_md_dev); OBD_FREE_PTR(m); RETURN(next); @@ -1123,6 +1271,25 @@ struct md_capainfo *md_capainfo(const struct lu_env *env) } EXPORT_SYMBOL(md_capainfo); +/* + * context key constructor/destructor: + * mdd_quota_key_init, mdd_quota_key_fini + */ +LU_KEY_INIT_FINI(mdd_quota, struct md_quota); + +struct lu_context_key mdd_quota_key = { + .lct_tags = LCT_SESSION, + .lct_init = mdd_quota_key_init, + .lct_fini = mdd_quota_key_fini +}; + +struct md_quota *md_quota(const struct lu_env *env) +{ + LASSERT(env->le_ses != NULL); + return lu_context_key_get(env->le_ses, &mdd_quota_key); +} +EXPORT_SYMBOL(md_quota); + static int mdd_changelog_user_register(struct mdd_device *mdd, int *id) { struct llog_ctxt *ctxt; @@ -1147,15 +1314,15 @@ static int mdd_changelog_user_register(struct mdd_device *mdd, int *id) rec->cur_hdr.lrh_len = sizeof(*rec); rec->cur_hdr.lrh_type = CHANGELOG_USER_REC; - spin_lock(&mdd->mdd_cl.mc_user_lock); + cfs_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); + 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; - spin_unlock(&mdd->mdd_cl.mc_user_lock); + cfs_spin_unlock(&mdd->mdd_cl.mc_user_lock); rc = llog_add(ctxt, &rec->cur_hdr, NULL, NULL, 0); @@ -1244,16 +1411,16 @@ static int mdd_changelog_user_purge(struct mdd_device *mdd, int id, int rc; ENTRY; - CDEBUG(D_IOCTL, "Purge request: id=%d, endrec="LPD64"\n", id, endrec); + CDEBUG(D_IOCTL, "Purge request: id=%d, endrec=%lld\n", id, endrec); data.mcud_id = id; data.mcud_minid = 0; data.mcud_minrec = 0; data.mcud_usercount = 0; data.mcud_endrec = endrec; - spin_lock(&mdd->mdd_cl.mc_lock); + cfs_spin_lock(&mdd->mdd_cl.mc_lock); endrec = mdd->mdd_cl.mc_index; - spin_unlock(&mdd->mdd_cl.mc_lock); + cfs_spin_unlock(&mdd->mdd_cl.mc_lock); if ((data.mcud_endrec == 0) || ((data.mcud_endrec > endrec) && (data.mcud_endrec != MCUD_UNREGISTER))) @@ -1344,7 +1511,8 @@ static int mdd_iocontrol(const struct lu_env *env, struct md_device *m, } /* 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_ucred_key, &mdd_capainfo_key, + &mdd_quota_key); const struct md_device_operations mdd_ops = { .mdo_statfs = mdd_statfs,