* Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2012, 2015, Intel Corporation.
+ * Copyright (c) 2012, 2016, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
oseq = ofd_seq_load(tsi->tsi_env, ofd, seq);
if (IS_ERR(oseq)) {
- CERROR("%s: Can't find FID Sequence "LPX64": rc = %ld\n",
+ CERROR("%s: Can't find FID Sequence %#llx: rc = %ld\n",
ofd_name(ofd), seq, PTR_ERR(oseq));
GOTO(out_sem, rc = -EINVAL);
}
(oa->o_flags & OBD_FL_RECREATE_OBJS)) {
if (!ofd_obd(ofd)->obd_recovering ||
oid > ofd_seq_last_oid(oseq)) {
- CERROR("%s: recreate objid "DOSTID" > last id "LPU64
+ CERROR("%s: recreate objid "DOSTID" > last id %llu"
"\n", ofd_name(ofd), POSTID(&oa->o_oi),
ofd_seq_last_oid(oseq));
GOTO(out_nolock, rc = -EINVAL);
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"
+ CERROR("%s:[%llu] destroys_in_progress already"
" cleared\n", ofd_name(ofd), seq);
ostid_set_id(&rep_oa->o_oi, ofd_seq_last_oid(oseq));
GOTO(out, rc = 0);
}
diff = oid - ofd_seq_last_oid(oseq);
- CDEBUG(D_HA, "ofd_last_id() = "LPU64" -> diff = %d\n",
+ CDEBUG(D_HA, "ofd_last_id() = %llu -> diff = %d\n",
ofd_seq_last_oid(oseq), diff);
if (-diff > OST_MAX_PRECREATE) {
/* Let MDS know that we are so far ahead. */
if (diff < 0) {
/* LU-5648 */
CERROR("%s: invalid precreate request for "
- DOSTID", last_id " LPU64 ". "
+ DOSTID", last_id %llu. "
"Likely MDS last_id corruption\n",
ofd_name(ofd), POSTID(&oa->o_oi),
ofd_seq_last_oid(oseq));
next_id = ofd_seq_last_oid(oseq) + 1;
count = ofd_precreate_batch(ofd, diff);
- CDEBUG(D_HA, "%s: reserve %d objects in group "LPX64
- " at "LPU64"\n", ofd_name(ofd),
+ CDEBUG(D_HA, "%s: reserve %d objects in group %#llx"
+ " at %llu\n", ofd_name(ofd),
count, seq, next_id);
if (!(lustre_msg_get_flags(req->rq_reqmsg) & MSG_REPLAY)
RETURN(rc);
}
- CDEBUG(D_INODE, "calling punch for object "DFID", valid = "LPX64
- ", start = "LPD64", end = "LPD64"\n", PFID(&tsi->tsi_fid),
+ CDEBUG(D_INODE, "calling punch for object "DFID", valid = %#llx"
+ ", start = %lld, end = %lld\n", PFID(&tsi->tsi_fid),
oa->o_valid, start, end);
fo = ofd_object_find_exists(tsi->tsi_env, ofd_exp(tsi->tsi_exp),
static int ofd_ladvise_prefetch(const struct lu_env *env,
struct ofd_object *fo,
+ struct niobuf_local *lnb,
__u64 start, __u64 end)
{
struct ofd_thread_info *info = ofd_info(env);
pgoff_t start_index, end_index, pages;
struct niobuf_remote rnb;
unsigned long nr_local;
- struct niobuf_local *lnb;
int rc = 0;
if (end <= start)
RETURN(-EINVAL);
- OBD_ALLOC_LARGE(lnb, sizeof(*lnb) * PTLRPC_MAX_BRW_PAGES);
- if (lnb == NULL)
- RETURN(-ENOMEM);
-
ofd_read_lock(env, fo);
if (!ofd_object_exists(fo))
GOTO(out_unlock, rc = -ENOENT);
out_unlock:
ofd_read_unlock(env, fo);
- OBD_FREE_LARGE(lnb, sizeof(*lnb) * PTLRPC_MAX_BRW_PAGES);
RETURN(rc);
}
*/
static int ofd_ladvise_hdl(struct tgt_session_info *tsi)
{
- struct ptlrpc_request *req = tgt_ses_req(tsi);
- struct obd_export *exp = tsi->tsi_exp;
- struct ofd_device *ofd = ofd_exp(exp);
- struct ost_body *body, *repbody;
- struct ofd_thread_info *info;
- struct ofd_object *fo;
- const struct lu_env *env = req->rq_svc_thread->t_env;
- int rc = 0;
- struct lu_ladvise *ladvise;
- int num_advise;
- struct ladvise_hdr *ladvise_hdr;
- struct obd_ioobj ioo;
- struct lustre_handle lockh = { 0 };
- __u64 flags = 0;
- int i;
- struct dt_object *dob;
+ struct ptlrpc_request *req = tgt_ses_req(tsi);
+ struct obd_export *exp = tsi->tsi_exp;
+ struct ofd_device *ofd = ofd_exp(exp);
+ struct ost_body *body, *repbody;
+ struct ofd_thread_info *info;
+ struct ofd_object *fo;
+ struct ptlrpc_thread *svc_thread = req->rq_svc_thread;
+ const struct lu_env *env = svc_thread->t_env;
+ struct tgt_thread_big_cache *tbc = svc_thread->t_data;
+ int rc = 0;
+ struct lu_ladvise *ladvise;
+ int num_advise;
+ struct ladvise_hdr *ladvise_hdr;
+ struct obd_ioobj ioo;
+ struct lustre_handle lockh = { 0 };
+ __u64 flags = 0;
+ int i;
+ struct dt_object *dob;
+ __u64 start;
+ __u64 end;
ENTRY;
CFS_FAIL_TIMEOUT(OBD_FAIL_OST_LADVISE_PAUSE, cfs_fail_val);
dob = ofd_object_child(fo);
for (i = 0; i < num_advise; i++, ladvise++) {
- if (ladvise->lla_end <= ladvise->lla_start) {
+ start = ladvise->lla_start;
+ end = ladvise->lla_end;
+ if (end <= start) {
rc = err_serious(-EPROTO);
break;
}
rc = -ENOTSUPP;
break;
case LU_LADVISE_WILLREAD:
+ if (tbc == NULL)
+ RETURN(-ENOMEM);
+
ioo.ioo_oid = body->oa.o_oi;
ioo.ioo_bufcnt = 1;
rc = tgt_extent_lock(exp->exp_obd->obd_namespace,
- &tsi->tsi_resid,
- ladvise->lla_start,
- ladvise->lla_end - 1,
+ &tsi->tsi_resid, start, end - 1,
&lockh, LCK_PR, &flags);
if (rc != 0)
break;
- req->rq_status = ofd_ladvise_prefetch(env,
- fo,
- ladvise->lla_start,
- ladvise->lla_end);
+ req->rq_status = ofd_ladvise_prefetch(env, fo,
+ tbc->local,
+ start, end);
tgt_extent_unlock(&lockh, LCK_PR);
break;
case LU_LADVISE_DONTNEED:
static inline int prolong_timeout(struct ptlrpc_request *req)
{
struct ptlrpc_service_part *svcpt = req->rq_rqbd->rqbd_svcpt;
+ time_t req_timeout;
if (AT_OFF)
return obd_timeout / 2;
- return at_est2timeout(at_get(&svcpt->scp_at_estimate));
+ req_timeout = req->rq_deadline - req->rq_arrival_time.tv_sec;
+ return max_t(time_t, at_est2timeout(at_get(&svcpt->scp_at_estimate)),
+ req_timeout);
}
/**
data->lpa_export = tsi->tsi_exp;
data->lpa_resid = tsi->tsi_resid;
- CDEBUG(D_RPCTRACE, "Prolong locks for req %p with x"LPU64
- " ext("LPU64"->"LPU64")\n", tgt_ses_req(tsi),
+ CDEBUG(D_RPCTRACE, "Prolong locks for req %p with x%llu"
+ " ext(%llu->%llu)\n", tgt_ses_req(tsi),
tgt_ses_req(tsi)->rq_xid, data->lpa_extent.start,
data->lpa_extent.end);
pa.lpa_extent.end = rnb->rnb_offset + rnb->rnb_len - 1;
DEBUG_REQ(D_RPCTRACE, req, "%s %s: refresh rw locks: "DFID
- " ("LPU64"->"LPU64")\n", tgt_name(tsi->tsi_tgt),
+ " (%llu->%llu)\n", tgt_name(tsi->tsi_tgt),
current->comm, PFID(&tsi->tsi_fid), pa.lpa_extent.start,
pa.lpa_extent.end);
pa.lpa_extent.end = oa->o_blocks;
CDEBUG(D_DLMTRACE,
- "%s: refresh locks: "LPU64"/"LPU64" ("LPU64"->"LPU64")\n",
+ "%s: refresh locks: %llu/%llu (%llu->%llu)\n",
tgt_name(tsi->tsi_tgt), tsi->tsi_resid.name[0],
tsi->tsi_resid.name[1], pa.lpa_extent.start, pa.lpa_extent.end);
static int ofd_init0(const struct lu_env *env, struct ofd_device *m,
struct lu_device_type *ldt, struct lustre_cfg *cfg)
{
- const char *dev = lustre_cfg_string(cfg, 0);
- struct ofd_thread_info *info = NULL;
- struct obd_device *obd;
- struct obd_statfs *osfs;
- struct lu_fid fid;
- int rc;
+ const char *dev = lustre_cfg_string(cfg, 0);
+ struct ofd_thread_info *info = NULL;
+ struct obd_device *obd;
+ struct obd_statfs *osfs;
+ struct lu_fid fid;
+ struct nm_config_file *nodemap_config;
+ int rc;
ENTRY;
CERROR("%s: can't get statfs data, rc %d\n", obd->obd_name, rc);
GOTO(err_fini_stack, rc);
}
- if (!IS_PO2(osfs->os_bsize)) {
+ if (!is_power_of_2(osfs->os_bsize)) {
CERROR("%s: blocksize (%d) is not a power of 2\n",
obd->obd_name, osfs->os_bsize);
GOTO(err_fini_stack, rc = -EPROTO);
if (rc != 0)
GOTO(err_fini_fs, rc);
- rc = nodemap_fs_init(env, m->ofd_osd, obd, m->ofd_los);
- if (rc != 0)
- GOTO(err_fini_los, rc);
+ nodemap_config = nm_config_file_register_tgt(env, m->ofd_osd,
+ m->ofd_los);
+ if (IS_ERR(nodemap_config))
+ GOTO(err_fini_los, rc = PTR_ERR(nodemap_config));
+
+ obd->u.obt.obt_nodemap_config_file = nodemap_config;
rc = ofd_start_inconsistency_verification_thread(m);
if (rc != 0)
RETURN(0);
err_fini_nm:
- nodemap_fs_fini(env, obd);
+ nm_config_file_deregister_tgt(env, obd->u.obt.obt_nodemap_config_file);
+ obd->u.obt.obt_nodemap_config_file = NULL;
err_fini_los:
local_oid_storage_fini(env, m->ofd_los);
m->ofd_los = NULL;
ofd_stop_inconsistency_verification_thread(m);
lfsck_degister(env, m->ofd_osd);
ofd_fs_cleanup(env, m);
- nodemap_fs_fini(env, obd);
+ nm_config_file_deregister_tgt(env, obd->u.obt.obt_nodemap_config_file);
+ obd->u.obt.obt_nodemap_config_file = NULL;
if (m->ofd_los != NULL) {
local_oid_storage_fini(env, m->ofd_los);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff