* Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2012, Intel Corporation.
+ * Copyright (c) 2012, 2013, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
static int ofd_parse_connect_data(const struct lu_env *env,
struct obd_export *exp,
- struct obd_connect_data *data)
+ struct obd_connect_data *data,
+ bool new_connection)
{
struct ofd_device *ofd = ofd_exp(exp);
struct filter_export_data *fed = &exp->exp_filter_data;
}
if (exp_connect_flags(exp) & OBD_CONNECT_GRANT)
- data->ocd_grant = ofd_grant_connect(env, exp, data->ocd_grant);
+ data->ocd_grant = ofd_grant_connect(env, exp, data->ocd_grant,
+ new_connection);
if (data->ocd_connect_flags & OBD_CONNECT_INDEX) {
struct lr_server_data *lsd = &ofd->ofd_lut.lut_lsd;
if (data->ocd_connect_flags & OBD_CONNECT_MAXBYTES)
data->ocd_maxbytes = ofd->ofd_dt_conf.ddp_maxbytes;
- if (data->ocd_connect_flags & OBD_CONNECT_PINGLESS) {
+ if (OCD_HAS_FLAG(data, PINGLESS)) {
if (ptlrpc_pinger_suppress_pings()) {
spin_lock(&exp->exp_obd->obd_dev_lock);
list_del_init(&exp->exp_obd_chain_timed);
}
ofd_info_init(env, exp);
- rc = ofd_parse_connect_data(env, exp, data);
+ rc = ofd_parse_connect_data(env, exp, data, false);
if (rc == 0)
ofd_export_stats_init(ofd, exp, localdata);
ofd_info_init(env, exp);
- rc = ofd_parse_connect_data(env, exp, data);
+ rc = ofd_parse_connect_data(env, exp, data, true);
if (rc)
GOTO(out, rc);
struct lov_stripe_md *lsm)
{
struct ofd_device *ofd;
- int rc = 0;
+ int rc = 0;
ENTRY;
RETURN(-EINVAL);
}
+ /* Because ofd_get_info might be called from
+ * handle_request_in as well(see LU-3239), where env might
+ * not be initilaized correctly, and le_ses might be in
+ * an un-initialized state, so only refill le_ctx here */
+ rc = lu_env_refill((struct lu_env *)env);
+ if (rc != 0)
+ RETURN(rc);
+
ofd = ofd_exp(exp);
if (KEY_IS(KEY_BLOCKSIZE)) {
__u32 *blocksize = val;
if (blocksize) {
if (*vallen < sizeof(*blocksize))
- RETURN(-EOVERFLOW);
+ GOTO(out, rc = -EOVERFLOW);
*blocksize = 1 << ofd->ofd_dt_conf.ddp_block_shift;
}
*vallen = sizeof(*blocksize);
__u32 *blocksize_bits = val;
if (blocksize_bits) {
if (*vallen < sizeof(*blocksize_bits))
- RETURN(-EOVERFLOW);
+ GOTO(out, rc = -EOVERFLOW);
*blocksize_bits = ofd->ofd_dt_conf.ddp_block_shift;
}
*vallen = sizeof(*blocksize_bits);
if (val == NULL) {
*vallen = sizeof(obd_id);
- RETURN(0);
+ GOTO(out, rc = 0);
}
ofd_info_init(env, exp);
oseq = ofd_seq_load(env, ofd,
if (last_id) {
if (*vallen < sizeof(*last_id)) {
ofd_seq_put(env, oseq);
- RETURN(-EOVERFLOW);
+ GOTO(out, rc = -EOVERFLOW);
}
*last_id = ofd_seq_last_oid(oseq);
}
if (val == NULL) {
*vallen = fiemap_count_to_size(
fm_key->fiemap.fm_extent_count);
- RETURN(0);
+ GOTO(out, rc = 0);
}
info = ofd_info_init(env, exp);
-
- fid_ostid_unpack(&info->fti_fid, &fm_key->oa.o_oi, 0);
-
+ rc = ostid_to_fid(&info->fti_fid, &fm_key->oa.o_oi, 0);
+ if (rc != 0)
+ GOTO(out, rc);
CDEBUG(D_INODE, "get FIEMAP of object "DFID"\n",
PFID(&info->fti_fid));
*((__u32 *) val) = ofd->ofd_sync_lock_cancel;
*vallen = sizeof(__u32);
} else if (KEY_IS(KEY_LAST_FID)) {
- struct lu_env env;
struct ofd_device *ofd = ofd_exp(exp);
struct ofd_seq *oseq;
- struct ost_id *oid = val;
+ struct lu_fid *fid = val;
int rc;
- if (oid == NULL) {
- *vallen = sizeof(struct ost_id);
- RETURN(0);
+ if (fid == NULL) {
+ *vallen = sizeof(struct lu_fid);
+ GOTO(out, rc = 0);
}
- if (*vallen < sizeof(*oid))
- RETURN(-EOVERFLOW);
+ if (*vallen < sizeof(*fid))
+ GOTO(out, rc = -EOVERFLOW);
- rc = lu_env_init(&env, LCT_DT_THREAD);
- if (rc != 0)
- RETURN(rc);
- ofd_info_init(&env, exp);
+ ofd_info_init(env, exp);
- ostid_le_to_cpu(oid, oid);
+ fid_le_to_cpu(fid, fid);
- oseq = ofd_seq_load(&env, ofd, oid->oi_seq);
+ oseq = ofd_seq_load(env, ofd,
+ ostid_seq((struct ost_id *)fid));
if (IS_ERR(oseq))
- GOTO(out_fini, rc = PTR_ERR(oseq));
+ GOTO(out, rc = PTR_ERR(oseq));
- CDEBUG(D_HA, "LAST FID is "DOSTID"\n", POSTID(&oseq->os_oi));
+ rc = ostid_to_fid(fid, &oseq->os_oi,
+ ofd->ofd_lut.lut_lsd.lsd_osd_index);
+ if (rc != 0)
+ GOTO(out_put, rc);
- *oid = oseq->os_oi;
- *vallen = sizeof(*oid);
- ofd_seq_put(&env, oseq);
-out_fini:
- lu_env_fini(&env);
+ CDEBUG(D_HA, "%s: LAST FID is "DFID"\n", ofd_name(ofd),
+ PFID(fid));
+ *vallen = sizeof(*fid);
+out_put:
+ ofd_seq_put(env, oseq);
} else {
CERROR("Not supported key %s\n", (char*)key);
rc = -EOPNOTSUPP;
}
-
+out:
RETURN(rc);
}
info = ofd_info_init(env, exp);
ofd_oti2info(info, oti);
- fid_ostid_unpack(&info->fti_fid, &oinfo->oi_oa->o_oi, 0);
- ofd_build_resid(&info->fti_fid, &info->fti_resid);
+ rc = ostid_to_fid(&info->fti_fid, &oinfo->oi_oa->o_oi, 0);
+ if (rc != 0)
+ RETURN(rc);
- rc = ofd_auth_capa(exp, &info->fti_fid, oa->o_seq,
+ ost_fid_build_resid(&info->fti_fid, &info->fti_resid);
+ rc = ofd_auth_capa(exp, &info->fti_fid, ostid_seq(&oa->o_oi),
oinfo_capa(oinfo), CAPA_OPC_META_WRITE);
if (rc)
GOTO(out, rc);
info = ofd_info_init(env, exp);
ofd_oti2info(info, oti);
- fid_ostid_unpack(&info->fti_fid, &oinfo->oi_oa->o_oi, 0);
- ofd_build_resid(&info->fti_fid, &info->fti_resid);
+ rc = ostid_to_fid(&info->fti_fid, &oinfo->oi_oa->o_oi, 0);
+ if (rc != 0)
+ RETURN(rc);
+ ost_fid_build_resid(&info->fti_fid, &info->fti_resid);
CDEBUG(D_INODE, "calling punch for object "DFID", valid = "LPX64
", start = "LPD64", end = "LPD64"\n", PFID(&info->fti_fid),
oinfo->oi_oa->o_valid, oinfo->oi_policy.l_extent.start,
oinfo->oi_policy.l_extent.end);
- rc = ofd_auth_capa(exp, &info->fti_fid, oinfo->oi_oa->o_seq,
+ rc = ofd_auth_capa(exp, &info->fti_fid, ostid_seq(&oinfo->oi_oa->o_oi),
oinfo_capa(oinfo), CAPA_OPC_OSS_TRUNC);
if (rc)
GOTO(out_env, rc);
/* Tell the clients that the object is gone now and that they should
* throw away any cached pages. */
- ofd_build_resid(fid, &info->fti_resid);
+ ost_fid_build_resid(fid, &info->fti_resid);
rc = ldlm_cli_enqueue_local(ofd->ofd_namespace, &info->fti_resid,
LDLM_EXTENT, &policy, LCK_PW, &flags,
ldlm_blocking_ast, ldlm_completion_ast,
ofd_oti2info(info, oti);
if (!(oa->o_valid & OBD_MD_FLGROUP))
- oa->o_seq = 0;
+ ostid_set_seq_mdt0(&oa->o_oi);
/* check that o_misc makes sense */
if (oa->o_valid & OBD_MD_FLOBJCOUNT)
*/
if (info->fti_transno == 0) /* not replay */
info->fti_mult_trans = 1;
+
+ CDEBUG(D_HA, "%s: Destroy object "DOSTID" count %d\n", ofd_name(ofd),
+ POSTID(&oa->o_oi), count);
while (count > 0) {
int lrc;
- fid_ostid_unpack(&info->fti_fid, &oa->o_oi, 0);
+ lrc = ostid_to_fid(&info->fti_fid, &oa->o_oi, 0);
+ if (lrc != 0) {
+ if (rc == 0)
+ rc = lrc;
+ GOTO(out, rc);
+ }
lrc = ofd_destroy_by_fid(env, ofd, &info->fti_fid, 0);
if (lrc == -ENOENT) {
CDEBUG(D_INODE,
rc = lrc;
}
count--;
- oa->o_id++;
+ ostid_inc_id(&oa->o_oi);
}
/* if we have transaction then there were some deletions, we don't
info->fti_transno = 0;
}
ofd_info2oti(info, oti);
+out:
RETURN(rc);
}
int skip_orphan;
int rc = 0;
struct ost_id oi = oa->o_oi;
+ __u64 end_id = ostid_id(&oa->o_oi);
struct ofd_seq *oseq;
ENTRY;
- oseq = ofd_seq_get(ofd, oa->o_seq);
+ oseq = ofd_seq_get(ofd, ostid_seq(&oa->o_oi));
if (oseq == NULL) {
- CERROR("%s: Can not find seq for "LPU64":"LPU64"\n",
- ofd_name(ofd), oa->o_seq, oa->o_id);
+ CERROR("%s: Can not find seq for "DOSTID"\n",
+ ofd_name(ofd), POSTID(&oa->o_oi));
RETURN(-EINVAL);
}
last = ofd_seq_last_oid(oseq);
LCONSOLE_INFO("%s: deleting orphan objects from "LPX64":"LPU64
- " to "LPU64"\n", ofd_name(ofd), oa->o_seq,
- oa->o_id + 1, last);
+ " to "LPU64"\n", ofd_name(ofd), ostid_seq(&oa->o_oi),
+ end_id + 1, last);
- for (oi.oi_id = last; oi.oi_id > oa->o_id; oi.oi_id--) {
- fid_ostid_unpack(&info->fti_fid, &oi, 0);
+ for (ostid_set_id(&oi, last); ostid_id(&oi) > end_id;
+ ostid_dec_id(&oi)) {
+ rc = ostid_to_fid(&info->fti_fid, &oi, 0);
+ if (rc != 0)
+ GOTO(out_put, rc);
rc = ofd_destroy_by_fid(env, ofd, &info->fti_fid, 1);
if (rc && rc != -ENOENT) /* this is pretty fatal... */
- CEMERG("error destroying precreated id "LPU64": %d\n",
- oi.oi_id, rc);
+ CEMERG("error destroying precreated id "DOSTID": %d\n",
+ POSTID(&oi), rc);
if (!skip_orphan) {
- ofd_seq_last_oid_set(oseq, oi.oi_id - 1);
+ ofd_seq_last_oid_set(oseq, ostid_id(&oi) - 1);
/* update last_id on disk periodically so that if we
* restart * we don't need to re-scan all of the just
* deleted objects. */
- if ((oi.oi_id & 511) == 0)
+ if ((ostid_id(&oi) & 511) == 0)
ofd_seq_last_oid_write(env, ofd, oseq);
}
}
- CDEBUG(D_HA, "%s: after destroy: set last_objids["LPU64"] = "LPU64"\n",
- ofd_obd(ofd)->obd_name, oa->o_seq, oa->o_id);
+ CDEBUG(D_HA, "%s: after destroy: set last_objids"DOSTID"\n",
+ ofd_obd(ofd)->obd_name, POSTID(&oa->o_oi));
if (!skip_orphan) {
rc = ofd_seq_last_oid_write(env, ofd, oseq);
} else {
/* don't reuse orphan object, return last used objid */
- oa->o_id = last;
+ ostid_set_id(&oa->o_oi, last);
rc = 0;
}
+out_put:
ofd_seq_put(env, oseq);
RETURN(rc);
}
{
struct ofd_device *ofd = ofd_exp(exp);
struct ofd_thread_info *info;
- obd_seq seq = oa->o_seq;
+ obd_seq seq = ostid_seq(&oa->o_oi);
struct ofd_seq *oseq;
int rc = 0, diff;
int sync_trans = 0;
info = ofd_info_init(env, exp);
ofd_oti2info(info, oti);
- LASSERT(oa->o_seq >= FID_SEQ_OST_MDT0);
+ LASSERT(ostid_seq(&oa->o_oi) >= FID_SEQ_OST_MDT0);
LASSERT(oa->o_valid & OBD_MD_FLGROUP);
- CDEBUG(D_INFO, "ofd_create(oa->o_seq="LPU64",oa->o_id="LPU64")\n",
- seq, oa->o_id);
+ CDEBUG(D_INFO, "ofd_create("DOSTID")\n", POSTID(&oa->o_oi));
oseq = ofd_seq_load(env, ofd, seq);
if (IS_ERR(oseq)) {
if ((oa->o_valid & OBD_MD_FLFLAGS) &&
(oa->o_flags & OBD_FL_RECREATE_OBJS)) {
if (!ofd_obd(ofd)->obd_recovering ||
- oa->o_id > ofd_seq_last_oid(oseq)) {
- CERROR("recreate objid "LPU64" > last id "LPU64"\n",
- oa->o_id, ofd_seq_last_oid(oseq));
+ ostid_id(&oa->o_oi) > ofd_seq_last_oid(oseq)) {
+ CERROR("recreate objid "DOSTID" > last id "LPU64"\n",
+ POSTID(&oa->o_oi), ofd_seq_last_oid(oseq));
GOTO(out_nolock, rc = -EINVAL);
}
/* do nothing because we create objects during first write */
oseq->os_destroys_in_progress = 1;
mutex_lock(&oseq->os_create_lock);
if (!oseq->os_destroys_in_progress) {
- CERROR("%s:["LPU64"] destroys_in_progress already cleared\n",
- exp->exp_obd->obd_name, oa->o_seq);
+ CERROR("%s:["LPU64"] destroys_in_progress already"
+ " cleared\n", exp->exp_obd->obd_name,
+ ostid_seq(&oa->o_oi));
+ ostid_set_id(&oa->o_oi, ofd_seq_last_oid(oseq));
GOTO(out, rc = 0);
}
- diff = oa->o_id - ofd_seq_last_oid(oseq);
+ diff = ostid_id(&oa->o_oi) - ofd_seq_last_oid(oseq);
CDEBUG(D_HA, "ofd_last_id() = "LPU64" -> diff = %d\n",
ofd_seq_last_oid(oseq), diff);
if (-diff > OST_MAX_PRECREATE) {
}
/* only precreate if seq is 0, IDIF or normal and also o_id
* must be specfied */
- if ((!fid_seq_is_mdt(oa->o_seq) &&
- !fid_seq_is_norm(oa->o_seq) &&
- !fid_seq_is_idif(oa->o_seq)) || oa->o_id == 0) {
+ if ((!fid_seq_is_mdt(ostid_seq(&oa->o_oi)) &&
+ !fid_seq_is_norm(ostid_seq(&oa->o_oi)) &&
+ !fid_seq_is_idif(ostid_seq(&oa->o_oi))) ||
+ ostid_id(&oa->o_oi) == 0) {
diff = 1; /* shouldn't we create this right now? */
} else {
- diff = oa->o_id - ofd_seq_last_oid(oseq);
+ diff = ostid_id(&oa->o_oi) - ofd_seq_last_oid(oseq);
/* Do sync create if the seq is about to used up */
- if (fid_seq_is_idif(oa->o_seq) ||
- fid_seq_is_mdt0(oa->o_seq)) {
- if (unlikely(oa->o_id >= IDIF_MAX_OID - 1))
+ if (fid_seq_is_idif(ostid_seq(&oa->o_oi)) ||
+ fid_seq_is_mdt0(ostid_seq(&oa->o_oi))) {
+ if (unlikely(ostid_id(&oa->o_oi) >= IDIF_MAX_OID - 1))
sync_trans = 1;
- } else if (fid_seq_is_norm(oa->o_seq)) {
- if (unlikely(oa->o_id >=
+ } else if (fid_seq_is_norm(ostid_seq(&oa->o_oi))) {
+ if (unlikely(ostid_id(&oa->o_oi) >=
LUSTRE_DATA_SEQ_MAX_WIDTH - 1))
sync_trans = 1;
} else {
- CERROR("%s : invalid o_seq "LPX64": rc = %d\n",
- ofd_name(ofd), oa->o_seq, -EINVAL);
+ CERROR("%s : invalid o_seq "DOSTID": rc = %d\n",
+ ofd_name(ofd), POSTID(&oa->o_oi), -EINVAL);
GOTO(out, rc = -EINVAL);
}
}
next_id = ofd_seq_last_oid(oseq) + 1;
count = ofd_precreate_batch(ofd, diff);
- CDEBUG(D_HA, "%s: reserve %d objects in group "LPU64
+ CDEBUG(D_HA, "%s: reserve %d objects in group "LPX64
" at "LPU64"\n", ofd_obd(ofd)->obd_name,
- count, oa->o_seq, next_id);
+ count, ostid_seq(&oa->o_oi), next_id);
if (cfs_time_after(jiffies, enough_time)) {
LCONSOLE_WARN("%s: Slow creates, %d/%d objects"
CERROR("%s: unable to precreate: rc = %d\n",
ofd_name(ofd), rc);
- oa->o_id = ofd_seq_last_oid(oseq);
+ ostid_set_id(&oa->o_oi, ofd_seq_last_oid(oseq));
oa->o_valid |= OBD_MD_FLID | OBD_MD_FLGROUP;
if (!(oa->o_valid & OBD_MD_FLFLAGS) ||
info = ofd_info_init(env, exp);
- fid_ostid_unpack(&info->fti_fid, &oinfo->oi_oa->o_oi, 0);
- rc = ofd_auth_capa(exp, &info->fti_fid, oinfo->oi_oa->o_seq,
+ rc = ostid_to_fid(&info->fti_fid, &oinfo->oi_oa->o_oi, 0);
+ if (rc != 0)
+ GOTO(out, rc);
+ rc = ofd_auth_capa(exp, &info->fti_fid, ostid_seq(&oinfo->oi_oa->o_oi),
oinfo_capa(oinfo), CAPA_OPC_META_READ);
if (rc)
GOTO(out, rc);
}
info = ofd_info_init(env, exp);
- fid_ostid_unpack(&info->fti_fid, &oinfo->oi_oa->o_oi, 0);
+ rc = ostid_to_fid(&info->fti_fid, &oinfo->oi_oa->o_oi, 0);
+ if (rc != 0)
+ GOTO(out, rc);
- rc = ofd_auth_capa(exp, &info->fti_fid, oinfo->oi_oa->o_seq,
+ rc = ofd_auth_capa(exp, &info->fti_fid, ostid_seq(&oinfo->oi_oa->o_oi),
oinfo_capa(oinfo), CAPA_OPC_OSS_TRUNC);
if (rc)
GOTO(out, rc);
data->ioc_inllen4 == sizeof(__u64)) {
struct ost_id ostid;
- ostid.oi_id = *(__u64 *)data->ioc_inlbuf3;
- ostid.oi_seq = *(__u64 *)data->ioc_inlbuf4;
- rc = fid_ostid_unpack(&fid, &ostid, 0);
+ ostid_set_seq(&ostid, *(__u64 *)data->ioc_inlbuf4);
+ ostid_set_id(&ostid, *(__u64 *)data->ioc_inlbuf3);
+ rc = ostid_to_fid(&fid, &ostid, 0);
if (rc != 0)
GOTO(out, rc);
} else {
git://git.whamcloud.com / fs / lustre-release.git / blobdiff