* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2011, 2015, Intel Corporation.
+ * Copyright (c) 2011, 2017, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
*
* Implementation of cl_object for OSC layer.
*
LASSERT(atomic_read(&osc->oo_nr_ios) == 0);
lu_object_fini(obj);
+ /* osc doen't contain an lu_object_header, so we don't need call_rcu */
OBD_SLAB_FREE_PTR(osc, osc_object_kmem);
}
EXPORT_SYMBOL(osc_object_free);
static int osc_object_ast_clear(struct ldlm_lock *lock, void *data)
{
+ struct osc_object *osc = (struct osc_object *)data;
+ struct ost_lvb *lvb = lock->l_lvb_data;
+ struct lov_oinfo *oinfo;
ENTRY;
- if (lock->l_ast_data == data)
+ if (lock->l_ast_data == data) {
lock->l_ast_data = NULL;
+
+ LASSERT(osc != NULL);
+ LASSERT(osc->oo_oinfo != NULL);
+ LASSERT(lvb != NULL);
+
+ /* Updates lvb in lock by the cached oinfo */
+ oinfo = osc->oo_oinfo;
+
+ LDLM_DEBUG(lock, "update lock size %llu blocks %llu [cma]time: "
+ "%llu %llu %llu by oinfo size %llu blocks %llu "
+ "[cma]time %llu %llu %llu", lvb->lvb_size,
+ lvb->lvb_blocks, lvb->lvb_ctime, lvb->lvb_mtime,
+ lvb->lvb_atime, oinfo->loi_lvb.lvb_size,
+ oinfo->loi_lvb.lvb_blocks, oinfo->loi_lvb.lvb_ctime,
+ oinfo->loi_lvb.lvb_mtime, oinfo->loi_lvb.lvb_atime);
+ LASSERTF(oinfo->loi_lvb.lvb_size >= oinfo->loi_kms,
+ "lvb_size %#llx, loi_kms %#llx\n",
+ oinfo->loi_lvb.lvb_size, oinfo->loi_kms);
+
+ cl_object_attr_lock(&osc->oo_cl);
+ memcpy(lvb, &oinfo->loi_lvb, sizeof(oinfo->loi_lvb));
+ cl_object_attr_unlock(&osc->oo_cl);
+ ldlm_clear_lvb_cached(lock);
+ }
RETURN(LDLM_ITER_CONTINUE);
}
mode = ldlm_lock_match(exp->exp_obd->obd_namespace,
LDLM_FL_BLOCK_GRANTED | LDLM_FL_LVB_READY,
&resid, LDLM_EXTENT, &policy,
- LCK_PR | LCK_PW, &lockh, 0);
+ LCK_PR | LCK_PW, &lockh);
if (mode) { /* lock is cached on client */
if (mode != LCK_PR) {
ldlm_lock_addref(&lockh, LCK_PR);
RETURN(rc);
}
-int osc_object_is_contended(struct osc_object *obj)
-{
- struct osc_device *dev = lu2osc_dev(obj->oo_cl.co_lu.lo_dev);
- int osc_contention_time = dev->od_contention_time;
- cfs_time_t cur_time = cfs_time_current();
- cfs_time_t retry_time;
-
- if (OBD_FAIL_CHECK(OBD_FAIL_OSC_OBJECT_CONTENTION))
- return 1;
-
- if (!obj->oo_contended)
- return 0;
-
- /*
- * I like copy-paste. the code is copied from
- * ll_file_is_contended.
- */
- retry_time = cfs_time_add(obj->oo_contention_time,
- cfs_time_seconds(osc_contention_time));
- if (cfs_time_after(cur_time, retry_time)) {
- osc_object_clear_contended(obj);
- return 0;
- }
- return 1;
-}
-EXPORT_SYMBOL(osc_object_is_contended);
-
/**
* Implementation of struct cl_object_operations::coo_req_attr_set() for osc
* layer. osc is responsible for struct obdo::o_id and struct obdo::o_seq
struct obdo *oa;
struct ost_lvb *lvb;
u64 flags = attr->cra_flags;
+ struct osc_page *opg;
- oinfo = cl2osc(obj)->oo_oinfo;
- lvb = &oinfo->loi_lvb;
- oa = attr->cra_oa;
+ oinfo = cl2osc(obj)->oo_oinfo;
+ lvb = &oinfo->loi_lvb;
+ oa = attr->cra_oa;
+ opg = osc_cl_page_osc(attr->cra_page, cl2osc(obj));
if ((flags & OBD_MD_FLMTIME) != 0) {
oa->o_mtime = lvb->lvb_mtime;
oa->o_valid |= OBD_MD_FLMTIME;
}
- if ((flags & OBD_MD_FLATIME) != 0) {
+ /* XXX:
+ * I don't understand this part, what for OSC resets atime just
+ * set by VVP layer to 0 so that OST gets 0 instead of actual
+ * atime, bzzz. please inspect this place with extra care.
+ */
+ if ((flags & OBD_MD_FLATIME) && lvb->lvb_atime > oa->o_atime) {
oa->o_atime = lvb->lvb_atime;
oa->o_valid |= OBD_MD_FLATIME;
}
}
oa->o_valid |= OBD_MD_FLID;
}
- if (flags & OBD_MD_FLHANDLE) {
+ /* if srvlock is set, don't look for a local lock, since we won't use
+ * it and shouldn't note it in the RPC
+ */
+ if (flags & OBD_MD_FLHANDLE && !opg->ops_srvlock) {
struct ldlm_lock *lock;
- struct osc_page *opg;
- opg = osc_cl_page_osc(attr->cra_page, cl2osc(obj));
lock = osc_dlmlock_at_pgoff(env, cl2osc(obj), osc_index(opg),
OSC_DAP_FL_TEST_LOCK | OSC_DAP_FL_CANCELING);
- if (lock == NULL && !opg->ops_srvlock) {
+ if (lock == NULL) {
struct ldlm_resource *res;
struct ldlm_res_id *resname;
resname = &osc_env_info(env)->oti_resname;
ostid_build_res_name(&oinfo->loi_oi, resname);
- res = ldlm_resource_get(
- osc_export(cl2osc(obj))->exp_obd->obd_namespace,
- NULL, resname, LDLM_EXTENT, 0);
- ldlm_resource_dump(D_ERROR, res);
+ res = ldlm_resource_get(osc_export(cl2osc(obj))->
+ exp_obd->obd_namespace,
+ resname, LDLM_EXTENT, 0);
+ if (IS_ERR(res))
+ CERROR("No lock resource\n");
+ else
+ ldlm_resource_dump(D_ERROR, res);
- libcfs_debug_dumpstack(NULL);
LBUG();
}
- /* check for lockless io. */
- if (lock != NULL) {
- oa->o_handle = lock->l_remote_handle;
- oa->o_valid |= OBD_MD_FLHANDLE;
- LDLM_LOCK_PUT(lock);
- }
+ oa->o_handle = lock->l_remote_handle;
+ oa->o_valid |= OBD_MD_FLHANDLE;
+ LDLM_LOCK_PUT(lock);
}
}
int osc_object_invalidate(const struct lu_env *env, struct osc_object *osc)
{
- struct l_wait_info lwi = { 0 };
ENTRY;
CDEBUG(D_INODE, "Invalidate osc object: %p, # of active IOs: %d\n",
osc, atomic_read(&osc->oo_nr_ios));
- l_wait_event(osc->oo_io_waitq, atomic_read(&osc->oo_nr_ios) == 0, &lwi);
+ wait_event_idle(osc->oo_io_waitq, atomic_read(&osc->oo_nr_ios) == 0);
/* Discard all dirty pages of this object. */
osc_cache_truncate_start(env, osc, 0, NULL);
osc_lock_discard_pages(env, osc, 0, CL_PAGE_EOF, true);
/* Clear ast data of dlm lock. Do this after discarding all pages */
- osc_object_prune(env, osc2cl(osc));
+ cl_object_prune(env, osc2cl(osc));
RETURN(0);
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff