#include <obd_class.h>
#include <obd_cksum.h>
-#include <uapi/linux/lustre_param.h>
+#include <uapi/linux/lustre/lustre_param.h>
#include <lustre_fid.h>
#include <lustre_lfsck.h>
-#include <lustre/lustre_idl.h>
#include <lustre_dlm.h>
#include <lustre_quota.h>
#include <lustre_nodemap.h>
/* lprocfs must be setup before the ofd so state can be safely added
* to /proc incrementally as the ofd is setup */
obd->obd_vars = lprocfs_ofd_obd_vars;
- rc = lprocfs_obd_setup(obd);
+ rc = lprocfs_obd_setup(obd, false);
if (rc) {
CERROR("%s: lprocfs_obd_setup failed: %d.\n",
obd->obd_name, rc);
repbody->oa.o_valid |= OBD_MD_FLDATAVERSION;
repbody->oa.o_data_version = curr_version;
}
+
+ if (fo->ofo_ff.ff_layout_version > 0) {
+ repbody->oa.o_valid |= OBD_MD_LAYOUT_VERSION;
+ repbody->oa.o_layout_version =
+ fo->ofo_ff.ff_layout_version + fo->ofo_ff.ff_range;
+
+ CDEBUG(D_INODE, DFID": get layout version: %u\n",
+ PFID(&tsi->tsi_fid),
+ repbody->oa.o_layout_version);
+ }
}
ofd_object_put(tsi->tsi_env, fo);
struct ost_body *repbody;
struct ldlm_resource *res;
struct ofd_object *fo;
- struct filter_fid *ff = NULL;
int rc = 0;
ENTRY;
la_from_obdo(&fti->fti_attr, &body->oa, body->oa.o_valid);
fti->fti_attr.la_valid &= ~LA_TYPE;
- if (body->oa.o_valid & OBD_MD_FLFID) {
- ff = &fti->fti_mds_fid;
- ofd_prepare_fidea(ff, &body->oa);
- }
-
/* setting objects attributes (including owner/group) */
- rc = ofd_attr_set(tsi->tsi_env, fo, &fti->fti_attr, ff);
+ rc = ofd_attr_set(tsi->tsi_env, fo, &fti->fti_attr, &body->oa);
if (rc != 0)
GOTO(out_put, rc);
}
}
if (diff > 0) {
- cfs_time_t enough_time = cfs_time_shift(DISK_TIMEOUT);
- u64 next_id;
- int created = 0;
- int count;
+ time64_t enough_time = ktime_get_seconds() + DISK_TIMEOUT;
+ u64 next_id;
+ int created = 0;
+ int count;
if (!(oa->o_valid & OBD_MD_FLFLAGS) ||
!(oa->o_flags & OBD_FL_DELORPHAN)) {
count, seq, next_id);
if (!(lustre_msg_get_flags(req->rq_reqmsg) & MSG_REPLAY)
- && cfs_time_after(jiffies, enough_time)) {
+ && ktime_get_seconds() > enough_time) {
CDEBUG(D_HA, "%s: Slow creates, %d/%lld objects"
" created at a rate of %d/s\n",
ofd_name(ofd), created, diff + created,
ENTRY;
+ OBD_FAIL_TIMEOUT(OBD_FAIL_OST_STATFS_DELAY, 10);
+
osfs = req_capsule_server_get(tsi->tsi_pill, &RMF_OBD_STATFS);
rc = ofd_statfs(tsi->tsi_env, tsi->tsi_exp, osfs,
struct ldlm_namespace *ns = tsi->tsi_tgt->lut_obd->obd_namespace;
struct ldlm_resource *res;
struct ofd_object *fo;
- struct filter_fid *ff = NULL;
__u64 flags = 0;
struct lustre_handle lh = { 0, };
int rc;
info->fti_attr.la_size = start;
info->fti_attr.la_valid |= LA_SIZE;
- if (oa->o_valid & OBD_MD_FLFID) {
- ff = &info->fti_mds_fid;
- ofd_prepare_fidea(ff, oa);
- }
-
rc = ofd_object_punch(tsi->tsi_env, fo, start, end, &info->fti_attr,
- ff, (struct obdo *)oa);
+ (struct obdo *)oa);
if (rc)
GOTO(out_put, rc);
static int ofd_ladvise_prefetch(const struct lu_env *env,
struct ofd_object *fo,
struct niobuf_local *lnb,
- __u64 start, __u64 end)
+ __u64 start, __u64 end, enum dt_bufs_type dbt)
{
- struct ofd_thread_info *info = ofd_info(env);
- pgoff_t start_index, end_index, pages;
- struct niobuf_remote rnb;
- unsigned long nr_local;
- int rc = 0;
+ struct ofd_thread_info *info = ofd_info(env);
+ pgoff_t start_index, end_index, pages;
+ struct niobuf_remote rnb;
+ unsigned long nr_local;
+ int rc = 0;
if (end <= start)
RETURN(-EINVAL);
if (end > info->fti_attr.la_size)
end = info->fti_attr.la_size;
- if (end == 0)
+ if (end <= start)
GOTO(out_unlock, rc);
/* We need page aligned offset and length */
PTLRPC_MAX_BRW_PAGES;
rnb.rnb_offset = start_index << PAGE_SHIFT;
rnb.rnb_len = nr_local << PAGE_SHIFT;
- rc = dt_bufs_get(env, ofd_object_child(fo), &rnb, lnb, 0);
+ rc = dt_bufs_get(env, ofd_object_child(fo), &rnb, lnb, dbt);
if (unlikely(rc < 0))
break;
nr_local = rc;
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;
+ enum dt_bufs_type dbt = DT_BUFS_TYPE_READAHEAD;
struct lu_ladvise *ladvise;
int num_advise;
struct ladvise_hdr *ladvise_hdr;
struct dt_object *dob;
__u64 start;
__u64 end;
+ int rc = 0;
ENTRY;
CFS_FAIL_TIMEOUT(OBD_FAIL_OST_LADVISE_PAUSE, cfs_fail_val);
LASSERT(fo != NULL);
dob = ofd_object_child(fo);
+ if (ptlrpc_connection_is_local(exp->exp_connection))
+ dbt |= DT_BUFS_TYPE_LOCAL;
+
for (i = 0; i < num_advise; i++, ladvise++) {
start = ladvise->lla_start;
end = ladvise->lla_end;
req->rq_status = ofd_ladvise_prefetch(env, fo,
tbc->local,
- start, end);
+ start, end, dbt);
tgt_extent_unlock(&lockh, LCK_PR);
break;
case LU_LADVISE_DONTNEED:
*
* \retval amount of time to extend the timeout with
*/
-static inline int prolong_timeout(struct ptlrpc_request *req)
+static inline time64_t prolong_timeout(struct ptlrpc_request *req)
{
struct ptlrpc_service_part *svcpt = req->rq_rqbd->rqbd_svcpt;
- time_t req_timeout;
+ time64_t req_timeout;
if (AT_OFF)
return obd_timeout / 2;
req_timeout = req->rq_deadline - req->rq_arrival_time.tv_sec;
- return max_t(time_t, at_est2timeout(at_get(&svcpt->scp_at_estimate)),
+ return max_t(time64_t, at_est2timeout(at_get(&svcpt->scp_at_estimate)),
req_timeout);
}
LASSERT(lock->l_export == data->lpa_export);
ldlm_lock_prolong_one(lock, data);
LDLM_LOCK_PUT(lock);
- RETURN_EXIT;
+ if (data->lpa_locks_cnt > 0)
+ RETURN_EXIT;
+ /* The lock was destroyed probably lets try
+ * resource tree. */
+ } else {
+ lock->l_last_used = ktime_get();
+ LDLM_LOCK_PUT(lock);
}
- lock->l_last_used = cfs_time_current();
- LDLM_LOCK_PUT(lock);
}
}
struct ofd_thread_info *info = NULL;
struct obd_device *obd;
struct tg_grants_data *tgd = &m->ofd_lut.lut_tgd;
- struct obd_statfs *osfs;
struct lu_fid fid;
struct nm_config_file *nodemap_config;
struct obd_device_target *obt;
m->ofd_raid_degraded = 0;
m->ofd_syncjournal = 0;
ofd_slc_set(m);
- tgd->tgd_grant_compat_disable = 0;
m->ofd_soft_sync_limit = OFD_SOFT_SYNC_LIMIT_DEFAULT;
- /* statfs data */
- spin_lock_init(&tgd->tgd_osfs_lock);
- tgd->tgd_osfs_age = cfs_time_shift_64(-1000);
- tgd->tgd_osfs_unstable = 0;
- tgd->tgd_statfs_inflight = 0;
- tgd->tgd_osfs_inflight = 0;
-
- /* grant data */
- spin_lock_init(&tgd->tgd_grant_lock);
- tgd->tgd_tot_dirty = 0;
- tgd->tgd_tot_granted = 0;
- tgd->tgd_tot_pending = 0;
-
m->ofd_seq_count = 0;
init_waitqueue_head(&m->ofd_inconsistency_thread.t_ctl_waitq);
INIT_LIST_HEAD(&m->ofd_inconsistency_list);
ptlrpc_init_client(LDLM_CB_REQUEST_PORTAL, LDLM_CB_REPLY_PORTAL,
"filter_ldlm_cb_client", &obd->obd_ldlm_client);
- dt_conf_get(env, m->ofd_osd, &m->ofd_lut.lut_dt_conf);
-
rc = tgt_init(env, &m->ofd_lut, obd, m->ofd_osd, ofd_common_slice,
OBD_FAIL_OST_ALL_REQUEST_NET,
OBD_FAIL_OST_ALL_REPLY_NET);
if (rc)
GOTO(err_free_ns, rc);
- /* populate cached statfs data */
- osfs = &ofd_info(env)->fti_u.osfs;
- rc = tgt_statfs_internal(env, &m->ofd_lut, osfs, 0, NULL);
- if (rc != 0) {
- CERROR("%s: can't get statfs data, rc %d\n", obd->obd_name, rc);
- GOTO(err_fini_lut, rc);
- }
- 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_lut, rc = -EPROTO);
- }
- tgd->tgd_blockbits = fls(osfs->os_bsize) - 1;
+ tgd->tgd_reserved_pcnt = 0;
if (DT_DEF_BRW_SIZE < (1U << tgd->tgd_blockbits))
m->ofd_brw_size = 1U << tgd->tgd_blockbits;
m->ofd_cksum_types_supported = cksum_types_supported_server();
m->ofd_precreate_batch = OFD_PRECREATE_BATCH_DEFAULT;
- if (osfs->os_bsize * osfs->os_blocks < OFD_PRECREATE_SMALL_FS)
+ if (tgd->tgd_osfs.os_bsize * tgd->tgd_osfs.os_blocks <
+ OFD_PRECREATE_SMALL_FS)
m->ofd_precreate_batch = OFD_PRECREATE_BATCH_SMALL;
rc = ofd_fs_setup(env, m, obd);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff