* Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2011, 2013, Intel Corporation.
+ * Copyright (c) 2011, 2015, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
/*
* We got LOOKUP lock, but we really need attrs.
*/
- pmode = it->d.lustre.it_lock_mode;
+ pmode = it->it_lock_mode;
if (pmode) {
- plock.cookie = it->d.lustre.it_lock_handle;
- it->d.lustre.it_lock_mode = 0;
- it->d.lustre.it_data = NULL;
+ plock.cookie = it->it_lock_handle;
+ it->it_lock_mode = 0;
+ it->it_request = NULL;
}
LASSERT(fid_is_sane(&body->mbo_fid1));
* maintain dcache consistency. Thus drop UPDATE|PERM lock here
* and put LOOKUP in request.
*/
- if (it->d.lustre.it_lock_mode != 0) {
- it->d.lustre.it_remote_lock_handle =
- it->d.lustre.it_lock_handle;
- it->d.lustre.it_remote_lock_mode = it->d.lustre.it_lock_mode;
+ if (it->it_lock_mode != 0) {
+ it->it_remote_lock_handle =
+ it->it_lock_handle;
+ it->it_remote_lock_mode = it->it_lock_mode;
}
if (pmode) {
- it->d.lustre.it_lock_handle = plock.cookie;
- it->d.lustre.it_lock_mode = pmode;
+ it->it_lock_handle = plock.cookie;
+ it->it_lock_mode = pmode;
}
EXIT;
return rc;
}
-int lmv_revalidate_slaves(struct obd_export *exp, struct mdt_body *mbody,
- struct lmv_stripe_md *lsm,
+int lmv_revalidate_slaves(struct obd_export *exp,
+ const struct lmv_stripe_md *lsm,
ldlm_blocking_callback cb_blocking,
int extra_lock_flags)
{
struct ptlrpc_request *req = NULL;
struct mdt_body *body;
struct md_op_data *op_data;
- unsigned long size = 0;
- unsigned long nlink = 0;
- obd_time atime = 0;
- obd_time ctime = 0;
- obd_time mtime = 0;
int i;
int rc = 0;
if (rc < 0)
GOTO(cleanup, rc);
- lockh = (struct lustre_handle *)&it.d.lustre.it_lock_handle;
+ lockh = (struct lustre_handle *)&it.it_lock_handle;
if (rc > 0 && req == NULL) {
/* slave inode is still valid */
CDEBUG(D_INODE, "slave "DFID" is still valid.\n",
/* refresh slave from server */
body = req_capsule_server_get(&req->rq_pill,
&RMF_MDT_BODY);
- LASSERT(body != NULL);
- if (unlikely(body->mbo_nlink < 2)) {
- CERROR("%s: nlink %d < 2 corrupt stripe %d "DFID
- ":" DFID"\n",
- obd->obd_name, body->mbo_nlink, i,
- PFID(&lsm->lsm_md_oinfo[i].lmo_fid),
- PFID(&lsm->lsm_md_oinfo[0].lmo_fid));
-
- if (it.d.lustre.it_lock_mode && lockh) {
+ if (body == NULL) {
+ if (it.it_lock_mode && lockh) {
ldlm_lock_decref(lockh,
- it.d.lustre.it_lock_mode);
- it.d.lustre.it_lock_mode = 0;
+ it.it_lock_mode);
+ it.it_lock_mode = 0;
}
-
- GOTO(cleanup, rc = -EIO);
+ GOTO(cleanup, rc = -ENOENT);
}
-
i_size_write(inode, body->mbo_size);
+ inode->i_blocks = body->mbo_blocks;
set_nlink(inode, body->mbo_nlink);
LTIME_S(inode->i_atime) = body->mbo_atime;
LTIME_S(inode->i_ctime) = body->mbo_ctime;
LTIME_S(inode->i_mtime) = body->mbo_mtime;
}
- md_set_lock_data(tgt->ltd_exp, &lockh->cookie, inode, NULL);
-
- size += i_size_read(inode);
-
- if (i != 0)
- nlink += inode->i_nlink - 2;
- else
- nlink += inode->i_nlink;
-
- atime = LTIME_S(inode->i_atime) > atime ?
- LTIME_S(inode->i_atime) : atime;
- ctime = LTIME_S(inode->i_ctime) > ctime ?
- LTIME_S(inode->i_ctime) : ctime;
- mtime = LTIME_S(inode->i_mtime) > mtime ?
- LTIME_S(inode->i_mtime) : mtime;
-
- if (it.d.lustre.it_lock_mode != 0 && lockh != NULL) {
- ldlm_lock_decref(lockh, it.d.lustre.it_lock_mode);
- it.d.lustre.it_lock_mode = 0;
+ md_set_lock_data(tgt->ltd_exp, lockh, inode, NULL);
+ if (it.it_lock_mode != 0 && lockh != NULL) {
+ ldlm_lock_decref(lockh, it.it_lock_mode);
+ it.it_lock_mode = 0;
}
-
- CDEBUG(D_INODE, "i %d "DFID" size %llu, nlink %u, atime "
- "%lu, mtime %lu, ctime %lu.\n", i, PFID(&fid),
- i_size_read(inode), inode->i_nlink,
- LTIME_S(inode->i_atime), LTIME_S(inode->i_mtime),
- LTIME_S(inode->i_ctime));
}
- /*
- * update attr of master request.
- */
- CDEBUG(D_INODE, "Return refreshed attrs: size = %lu nlink %lu atime "
- LPU64 "ctime "LPU64" mtime "LPU64" for " DFID"\n", size, nlink,
- atime, ctime, mtime, PFID(&lsm->lsm_md_oinfo[0].lmo_fid));
-
- if (mbody != NULL) {
- mbody->mbo_atime = atime;
- mbody->mbo_ctime = ctime;
- mbody->mbo_mtime = mtime;
- }
cleanup:
if (req != NULL)
ptlrpc_req_finished(req);
* IT_OPEN is intended to open (and create, possible) an object. Parent (pid)
* may be split dir.
*/
-int lmv_intent_open(struct obd_export *exp, struct md_op_data *op_data,
- struct lookup_intent *it, struct ptlrpc_request **reqp,
- ldlm_blocking_callback cb_blocking, __u64 extra_lock_flags)
+static int lmv_intent_open(struct obd_export *exp, struct md_op_data *op_data,
+ struct lookup_intent *it,
+ struct ptlrpc_request **reqp,
+ ldlm_blocking_callback cb_blocking,
+ __u64 extra_lock_flags)
{
struct obd_device *obd = exp->exp_obd;
struct lmv_obd *lmv = &obd->u.lmv;
* Nothing is found, do not access body->fid1 as it is zero and thus
* pointless.
*/
- if ((it->d.lustre.it_disposition & DISP_LOOKUP_NEG) &&
- !(it->d.lustre.it_disposition & DISP_OPEN_CREATE) &&
- !(it->d.lustre.it_disposition & DISP_OPEN_OPEN))
+ if ((it->it_disposition & DISP_LOOKUP_NEG) &&
+ !(it->it_disposition & DISP_OPEN_CREATE) &&
+ !(it->it_disposition & DISP_OPEN_OPEN))
RETURN(rc);
body = req_capsule_server_get(&(*reqp)->rq_pill, &RMF_MDT_BODY);
/* Both migrating dir and unknown hash dir need to try
* all of sub-stripes */
- if (lsm != NULL && !lmv_is_known_hash_type(lsm)) {
+ if (lsm != NULL && !lmv_is_known_hash_type(lsm->lsm_md_hash_type)) {
struct lmv_oinfo *oinfo;
oinfo = &lsm->lsm_md_oinfo[0];
/* If RPC happens, lsm information will be revalidated
* during update_inode process (see ll_update_lsm_md) */
if (op_data->op_mea2 != NULL) {
- rc = lmv_revalidate_slaves(exp, NULL, op_data->op_mea2,
+ rc = lmv_revalidate_slaves(exp, op_data->op_mea2,
cb_blocking,
extra_lock_flags);
if (rc != 0)
/* release the previous request */
ptlrpc_req_finished(*reqp);
- it->d.lustre.it_data = NULL;
+ it->it_request = NULL;
*reqp = NULL;
oinfo = &lsm->lsm_md_oinfo[stripe_index];
PFID(&oinfo->lmo_fid));
op_data->op_fid1 = oinfo->lmo_fid;
- it->d.lustre.it_disposition &= ~DISP_ENQ_COMPLETE;
+ it->it_disposition &= ~DISP_ENQ_COMPLETE;
rc = md_intent_lock(tgt->ltd_exp, op_data, it, reqp,
cb_blocking, extra_lock_flags);
if (rc != 0)
ldlm_blocking_callback cb_blocking,
__u64 extra_lock_flags)
{
- struct obd_device *obd = exp->exp_obd;
- int rc;
+ int rc;
ENTRY;
LASSERT(it != NULL);
LASSERT(fid_is_sane(&op_data->op_fid1));
CDEBUG(D_INODE, "INTENT LOCK '%s' for "DFID" '%.*s' on "DFID"\n",
- LL_IT2STR(it), PFID(&op_data->op_fid2), op_data->op_namelen,
- op_data->op_name, PFID(&op_data->op_fid1));
-
- rc = lmv_check_connect(obd);
- if (rc)
- RETURN(rc);
+ LL_IT2STR(it), PFID(&op_data->op_fid2),
+ (int)op_data->op_namelen, op_data->op_name,
+ PFID(&op_data->op_fid1));
if (it->it_op & (IT_LOOKUP | IT_GETATTR | IT_LAYOUT))
rc = lmv_intent_lookup(exp, op_data, it, reqp, cb_blocking,
if (rc < 0) {
struct lustre_handle lock_handle;
- if (it->d.lustre.it_lock_mode != 0) {
- lock_handle.cookie = it->d.lustre.it_lock_handle;
+ if (it->it_lock_mode != 0) {
+ lock_handle.cookie = it->it_lock_handle;
ldlm_lock_decref(&lock_handle,
- it->d.lustre.it_lock_mode);
+ it->it_lock_mode);
}
- it->d.lustre.it_lock_handle = 0;
- it->d.lustre.it_lock_mode = 0;
+ it->it_lock_handle = 0;
+ it->it_lock_mode = 0;
- if (it->d.lustre.it_remote_lock_mode != 0) {
- lock_handle.cookie = it->d.lustre.it_remote_lock_handle;
+ if (it->it_remote_lock_mode != 0) {
+ lock_handle.cookie = it->it_remote_lock_handle;
ldlm_lock_decref(&lock_handle,
- it->d.lustre.it_remote_lock_mode);
+ it->it_remote_lock_mode);
}
- it->d.lustre.it_remote_lock_handle = 0;
- it->d.lustre.it_remote_lock_mode = 0;
+ it->it_remote_lock_handle = 0;
+ it->it_remote_lock_mode = 0;
}
RETURN(rc);