EXIT;
}
-static int changelog_init_cb(struct llog_handle *llh, struct llog_rec_hdr *hdr,
- void *data)
+static int changelog_init_cb(const struct lu_env *env, struct llog_handle *llh,
+ struct llog_rec_hdr *hdr, void *data)
{
struct mdd_device *mdd = (struct mdd_device *)data;
struct llog_changelog_rec *rec = (struct llog_changelog_rec *)hdr;
RETURN(LLOG_PROC_BREAK);
}
-static int changelog_user_init_cb(struct llog_handle *llh,
- struct llog_rec_hdr *hdr, void *data)
+static int changelog_user_init_cb(const struct lu_env *env,
+ struct llog_handle *llh,
+ struct llog_rec_hdr *hdr, void *data)
{
struct mdd_device *mdd = (struct mdd_device *)data;
struct llog_changelog_user_rec *rec =
return -EINVAL;
}
- rc = llog_cat_reverse_process(ctxt->loc_handle, changelog_init_cb, mdd);
+ rc = llog_cat_reverse_process(NULL, ctxt->loc_handle,
+ changelog_init_cb, mdd);
llog_ctxt_put(ctxt);
if (rc < 0) {
return -EINVAL;
}
- rc = llog_cat_reverse_process(ctxt->loc_handle, changelog_user_init_cb,
- mdd);
+ rc = llog_cat_reverse_process(NULL, ctxt->loc_handle,
+ changelog_user_init_cb, mdd);
llog_ctxt_put(ctxt);
if (rc < 0) {
return -ENXIO;
/* nested journal transaction */
- rc = llog_add(ctxt, &rec->cr_hdr, NULL, NULL, 0);
+ rc = llog_add(NULL, ctxt, &rec->cr_hdr, NULL, NULL, 0);
llog_ctxt_put(ctxt);
return rc;
return -ENXIO;
/* nested journal transaction */
- rc = llog_add(ctxt, &rec->cr_hdr, NULL, NULL, 0);
+ rc = llog_add(NULL, ctxt, &rec->cr_hdr, NULL, NULL, 0);
llog_ctxt_put(ctxt);
return rc;
* \param endrec
* \retval 0 ok
*/
-int mdd_changelog_llog_cancel(struct mdd_device *mdd, long long endrec)
+int mdd_changelog_llog_cancel(const struct lu_env *env,
+ struct mdd_device *mdd, long long endrec)
{
struct obd_device *obd = mdd2obd_dev(mdd);
struct llog_ctxt *ctxt;
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);
+ rc = llog_cancel(env, ctxt, NULL, 1, (struct llog_cookie *)&endrec, 0);
out:
llog_ctxt_put(ctxt);
return rc;
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)
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,
/* "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)
{
}
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_path = obf_path
};
/**
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);
+ CWARN("%s: bad FID format [%s], should be "DFID"\n",
+ mdd->mdd_obd_dev->obd_name, lname->ln_name,
+ (__u64)FID_SEQ_NORMAL, 1, 0);
GOTO(out, rc = -EINVAL);
}
+ if (!fid_is_norm(f)) {
+ CWARN("%s: "DFID" is invalid, sequence should be "
+ ">= "LPX64"\n", mdd->mdd_obd_dev->obd_name, PFID(f),
+ (__u64)FID_SEQ_NORMAL);
+ GOTO(out, rc = -EINVAL);
+ }
+
/* Check if object with this fid exists */
child = mdd_object_find(env, mdd, f);
if (child == NULL)
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);
+ rc = llog_add(NULL, ctxt, &rec->cur_hdr, NULL, NULL, 0);
CDEBUG(D_IOCTL, "Registered changelog user %d\n", *id);
out:
__u32 mcud_usercount;
int mcud_found:1;
struct mdd_device *mcud_mdd;
- const struct lu_env *mcud_env;
};
#define MCUD_UNREGISTER -1LL
* 1. Find the smallest record everyone is willing to purge
* 2. Update the last purgeable record for this user
*/
-static int mdd_changelog_user_purge_cb(struct llog_handle *llh,
- struct llog_rec_hdr *hdr, void *data)
+static int mdd_changelog_user_purge_cb(const struct lu_env *env,
+ struct llog_handle *llh,
+ struct llog_rec_hdr *hdr, void *data)
{
- struct llog_changelog_user_rec *rec;
- struct mdd_changelog_user_data *mcud =
- (struct mdd_changelog_user_data *)data;
- int rc;
+ struct llog_changelog_user_rec *rec;
+ struct mdd_changelog_user_data *mcud = data;
+ int rc;
+
ENTRY;
LASSERT(llh->lgh_hdr->llh_flags & LLOG_F_IS_PLAIN);
/* XXX This is a workaround for the deadlock of changelog
* adding vs. changelog cancelling. LU-81. */
- th = mdd_trans_create(mcud->mcud_env, mdd);
+ th = mdd_trans_create(env, mdd);
if (IS_ERR(th)) {
CERROR("Cannot get thandle\n");
RETURN(-ENOMEM);
}
- rc = mdd_declare_llog_cancel(mcud->mcud_env, mdd, th);
+ rc = mdd_declare_llog_cancel(env, mdd, th);
if (rc)
GOTO(stop, rc);
- rc = mdd_trans_start(mcud->mcud_env, mdd, th);
+ rc = mdd_trans_start(env, mdd, th);
if (rc)
GOTO(stop, rc);
- rc = llog_cat_cancel_records(llh->u.phd.phd_cat_handle,
- 1, &cookie);
+ rc = llog_cat_cancel_records(env, llh->u.phd.phd_cat_handle,
+ 1, &cookie);
if (rc == 0)
mcud->mcud_usercount--;
stop:
- mdd_trans_stop(mcud->mcud_env, mdd, 0, th);
+ mdd_trans_stop(env, mdd, 0, th);
RETURN(rc);
}
/* hdr+1 is loc of data */
hdr->lrh_len -= sizeof(*hdr) + sizeof(struct llog_rec_tail);
- rc = llog_write_rec(llh, hdr, NULL, 0, (void *)(hdr + 1),
- hdr->lrh_index);
+ rc = llog_write_rec(env, llh, hdr, NULL, 0, (void *)(hdr + 1),
+ hdr->lrh_index);
RETURN(rc);
}
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);
return -ENXIO;
LASSERT(ctxt->loc_handle->lgh_hdr->llh_flags & LLOG_F_IS_CAT);
- rc = llog_cat_process(ctxt->loc_handle, mdd_changelog_user_purge_cb,
- (void *)&data, 0, 0);
+ rc = llog_cat_process(env, ctxt->loc_handle,
+ mdd_changelog_user_purge_cb, (void *)&data,
+ 0, 0);
if ((rc >= 0) && (data.mcud_minrec > 0)) {
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 = mdd_changelog_llog_cancel(env, mdd, data.mcud_minrec);
} else {
CWARN("Could not determine changelog records to purge; rc=%d\n",
rc);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff