#define DEBUG_SUBSYSTEM S_MDS
#include <linux/module.h>
+#ifdef HAVE_EXT4_LDISKFS
+#include <ldiskfs/ldiskfs_jbd2.h>
+#else
#include <linux/jbd.h>
+#endif
#include <obd.h>
#include <obd_class.h>
#include <lustre_ver.h>
#include <lustre_disk.h>
#include <lustre_fid.h>
+#ifdef HAVE_EXT4_LDISKFS
+#include <ldiskfs/ldiskfs.h>
+#else
#include <linux/ldiskfs_fs.h>
+#endif
#include <lustre_mds.h>
#include <lustre/lustre_idl.h>
#include <lustre_disk.h> /* for changelogs */
mdd->mdd_txn_cb.dtc_txn_stop = mdd_txn_stop_cb;
mdd->mdd_txn_cb.dtc_txn_commit = mdd_txn_commit_cb;
mdd->mdd_txn_cb.dtc_cookie = mdd;
+ 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);
ENTRY;
mdd_changelog_fini(env, m);
dt_txn_callback_del(m->mdd_child, &m->mdd_txn_cb);
- mdd_object_put(env, m->mdd_dot_lustre_objs.mdd_obf);
- mdd_object_put(env, m->mdd_dot_lustre);
+ if (m->mdd_dot_lustre_objs.mdd_obf)
+ mdd_object_put(env, m->mdd_dot_lustre_objs.mdd_obf);
+ if (m->mdd_dot_lustre)
+ mdd_object_put(env, m->mdd_dot_lustre);
if (m->mdd_obd_dev)
mdd_fini_obd(env, m, cfg);
orph_index_fini(env, m);
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);
}
" 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);
}
CERROR("changelog init failed: %d\n", rc);
return rc;
}
- CDEBUG(D_INODE, "changelog starting index="LPU64"\n",
+ CDEBUG(D_IOCTL, "changelog starting index="LPU64"\n",
mdd->mdd_cl.mc_index);
/* Find last changelog user id */
CERROR("changelog user init failed: %d\n", rc);
return rc;
}
- return 0;
+
+ /* If we have registered users, assume we want changelogs on */
+ if (mdd->mdd_cl.mc_lastuser > 0)
+ rc = mdd_changelog_on(mdd, 1);
+
+ return rc;
}
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_spin_lock_init(&mdd->mdd_cl.mc_lock);
cfs_waitq_init(&mdd->mdd_cl.mc_waitq);
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);
mdd->mdd_cl.mc_flags = 0;
}
+/* Start / stop recording */
+int mdd_changelog_on(struct mdd_device *mdd, int on)
+{
+ int rc = 0;
+
+ if ((on == 1) && ((mdd->mdd_cl.mc_flags & CLM_ON) == 0)) {
+ LCONSOLE_INFO("%s: changelog on\n", mdd2obd_dev(mdd)->obd_name);
+ if (mdd->mdd_cl.mc_flags & CLM_ERR) {
+ CERROR("Changelogs cannot be enabled due to error "
+ "condition (see %s log).\n",
+ 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);
+ 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);
+ 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;
+}
+
+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
struct llog_ctxt *ctxt;
int rc;
- if ((mdd->mdd_cl.mc_mask & (1 << rec->cr_type)) == 0)
+ if ((mdd->mdd_cl.mc_mask & (1 << rec->cr.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;
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;
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);
/* 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);
memcpy(fid, &LU_DOT_LUSTRE_FID, sizeof(struct lu_fid));
mdo = llo_store_create_index(env, &m->mdd_md_dev, m->mdd_child,
- mdd_root_dir_name, mdd_dot_lustre_name,
+ mdd_root_dir_name, dot_lustre_name,
fid, &dt_directory_features);
/* .lustre dir may be already present */
if (IS_ERR(mdo) && PTR_ERR(mdo) != -EEXIST) {
rc = PTR_ERR(mdo);
CERROR("creating obj [%s] fid = "DFID" rc = %d\n",
- mdd_dot_lustre_name, PFID(fid), rc);
+ dot_lustre_name, PFID(fid), rc);
RETURN(rc);
}
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_xattr_get(const struct lu_env *env,
- struct md_object *obj, struct lu_buf *buf,
- const char *name)
+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_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_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;
+}
+
static int dot_lustre_mdd_open(const struct lu_env *env, struct md_object *obj,
int flags)
{
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);
return 0;
}
+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_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_open = dot_lustre_mdd_open,
- .moo_close = dot_lustre_close,
- .moo_readpage = mdd_readpage,
- .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;
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_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_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_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_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_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_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_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_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_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,
/* "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;
while (*name == '[')
name++;
- sscanf(name, SFID, &(f->f_seq), &(f->f_oid),
- &(f->f_ver));
+ sscanf(name, SFID, RFID(f));
if (!fid_is_sane(f)) {
CWARN("bad FID format [%s], should be "DFID"\n", lname->ln_name,
(__u64)1, 2, 0);
return rc;
dt_dot_lustre = dt_store_open(env, m->mdd_child, mdd_root_dir_name,
- mdd_dot_lustre_name, fid);
+ dot_lustre_name, fid);
if (IS_ERR(dt_dot_lustre)) {
rc = PTR_ERR(dt_dot_lustre);
GOTO(out, rc);
* 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;
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);
struct md_device *m,
struct lustre_capa_key *key)
{
+ 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;
int rc;
ENTRY;
rc = obd_set_info_async(lov_exp, sizeof(KEY_CAPA_KEY), KEY_CAPA_KEY,
- sizeof(*key), key, NULL);
+ sizeof(info), &info, NULL);
RETURN(rc);
}
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);
}
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;
RETURN(-ENOMEM);
}
+ /* Assume we want it on since somebody registered */
+ rc = mdd_changelog_on(mdd, 1);
+ if (rc)
+ GOTO(out, rc);
+
rec->cur_hdr.lrh_len = sizeof(*rec);
rec->cur_hdr.lrh_type = CHANGELOG_USER_REC;
- rec->cur_endrec = 0ULL;
- 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;
- spin_unlock(&mdd->mdd_cl.mc_user_lock);
+ rec->cur_endrec = mdd->mdd_cl.mc_index;
+ cfs_spin_unlock(&mdd->mdd_cl.mc_user_lock);
+
rc = llog_add(ctxt, &rec->cur_hdr, NULL, NULL, 0);
- CDEBUG(D_INODE, "Registered changelog user %d\n", *id);
+ CDEBUG(D_IOCTL, "Registered changelog user %d\n", *id);
out:
OBD_FREE_PTR(rec);
llog_ctxt_put(ctxt);
__u64 mcud_minrec; /**< lowest changelog recno still referenced */
__u32 mcud_id;
__u32 mcud_minid; /**< user id with lowest rec reference */
+ __u32 mcud_usercount;
int mcud_found:1;
};
+#define MCUD_UNREGISTER -1LL
/** Two things:
* 1. Find the smallest record everyone is willing to purge
rec = (struct llog_changelog_user_rec *)hdr;
- /* If we have a new endrec for this id, use it for the min check */
+ mcud->mcud_usercount++;
+
+ /* If we have a new endrec for this id, use it for the following
+ min check instead of its old value */
if (rec->cur_id == mcud->mcud_id)
rec->cur_endrec = max(rec->cur_endrec, mcud->mcud_endrec);
/* Update this user's record */
mcud->mcud_found = 1;
- /* Special case: unregister this user if endrec == -1 */
- if (mcud->mcud_endrec == -1) {
+ /* Special case: unregister this user */
+ if (mcud->mcud_endrec == MCUD_UNREGISTER) {
struct llog_cookie cookie;
cookie.lgc_lgl = llh->lgh_id;
cookie.lgc_index = hdr->lrh_index;
rc = llog_cat_cancel_records(llh->u.phd.phd_cat_handle,
1, &cookie);
+ if (rc == 0)
+ mcud->mcud_usercount--;
RETURN(rc);
}
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;
+ cfs_spin_lock(&mdd->mdd_cl.mc_lock);
+ endrec = mdd->mdd_cl.mc_index;
+ cfs_spin_unlock(&mdd->mdd_cl.mc_lock);
+ if ((data.mcud_endrec == 0) ||
+ ((data.mcud_endrec > endrec) &&
+ (data.mcud_endrec != MCUD_UNREGISTER)))
+ data.mcud_endrec = endrec;
ctxt = llog_get_context(mdd2obd_dev(mdd),LLOG_CHANGELOG_USER_ORIG_CTXT);
if (ctxt == NULL)
return -ENXIO;
LASSERT(ctxt->loc_handle->lgh_hdr->llh_flags & LLOG_F_IS_CAT);
- data.mcud_id = id;
- data.mcud_endrec = endrec;
- data.mcud_minid = 0;
- data.mcud_minrec = 0;
rc = llog_cat_process(ctxt->loc_handle, mdd_changelog_user_purge_cb,
(void *)&data, 0, 0);
if ((rc >= 0) && (data.mcud_minrec > 0)) {
- CDEBUG(D_INODE, "Purging CL entries up to "LPD64
+ CDEBUG(D_IOCTL, "Purging changelog entries up to "LPD64
", referenced by "CHANGELOG_USER_PREFIX"%d\n",
data.mcud_minrec, data.mcud_minid);
rc = mdd_changelog_llog_cancel(mdd, data.mcud_minrec);
rc);
}
+ llog_ctxt_put(ctxt);
+
if (!data.mcud_found) {
CWARN("No entry for user %d. Last changelog reference is "
LPD64" by changelog user %d\n", data.mcud_id,
rc = -ENOENT;
}
- llog_ctxt_put(ctxt);
+ if (!rc && data.mcud_usercount == 0)
+ /* No more users; turn changelogs off */
+ rc = mdd_changelog_on(mdd, 0);
+
RETURN (rc);
}
/** mdd_iocontrol
* May be called remotely from mdt_iocontrol_handle or locally from
- * mdt_iocontrol. Data may be freeform - remote handling doesn't enforce or
- * swab an obd_ioctl_data format (but local ioctl handler does).
+ * mdt_iocontrol. Data may be freeform - remote handling doesn't enforce
+ * an obd_ioctl_data format (but local ioctl handler does).
* \param cmd - ioc
* \param len - data len
* \param karg - ioctl data, in kernel space
/* Doesn't use obd_ioctl_data */
if (cmd == OBD_IOC_CHANGELOG_CLEAR) {
struct changelog_setinfo *cs = karg;
- if (len != sizeof(*cs)) {
- CERROR("Bad changelog_clear ioctl size %d\n", len);
- RETURN(-EINVAL);
- }
rc = mdd_changelog_user_purge(mdd, cs->cs_id, cs->cs_recno);
RETURN(rc);
}
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, -1);
+ rc = mdd_changelog_user_purge(mdd, data->ioc_u32_1,
+ MCUD_UNREGISTER);
break;
default:
rc = -EOPNOTSUPP;
}
/* 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,
git://git.whamcloud.com / fs / lustre-release.git / blobdiff