* GPL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
+ *
+ * Copyright (c) 2011 Whamcloud, Inc.
+ *
*/
/*
* This file is part of Lustre, http://www.lustre.org/
info->mti_ver[idx] = ENOENT_VERSION;
if (rc == 0) {
struct mdt_object *child;
- child = mdt_object_find(info->mti_env, info->mti_mdt, fid);
+ child = mdt_object_find(info->mti_env, info->mti_mdt, fid,
+ MDT_OBJ_MAY_NOT_EXIST);
if (likely(!IS_ERR(child))) {
mdt_obj_version_get(info, child, &info->mti_ver[idx]);
mdt_object_put(info->mti_env, child);
mdt_lock_pdo_init(lh, LCK_PW, rr->rr_name, rr->rr_namelen);
parent = mdt_object_find_lock(info, rr->rr_fid1, lh,
- MDS_INODELOCK_UPDATE);
+ MDS_INODELOCK_UPDATE, MDT_OBJ_MUST_EXIST);
if (IS_ERR(parent))
RETURN(PTR_ERR(parent));
/* save version of file name for replay, it must be ENOENT here */
mdt_enoent_version_save(info, 1);
- child = mdt_object_find(info->mti_env, mdt, rr->rr_fid2);
+ child = mdt_object_find(info->mti_env, mdt, rr->rr_fid2,
+ MDT_OBJ_MAY_NOT_EXIST);
if (likely(!IS_ERR(child))) {
struct md_object *next = mdt_object_child(parent);
repbody = req_capsule_server_get(info->mti_pill, &RMF_MDT_BODY);
- o = mdt_object_find(info->mti_env, mdt, info->mti_rr.rr_fid2);
+ o = mdt_object_find(info->mti_env, mdt, info->mti_rr.rr_fid2,
+ MDT_OBJ_MAY_NOT_EXIST);
if (!IS_ERR(o)) {
struct md_object *next = mdt_object_child(o);
ldlm_request_cancel(req, info->mti_dlm_req, 0);
repbody = req_capsule_server_get(info->mti_pill, &RMF_MDT_BODY);
- mo = mdt_object_find(info->mti_env, info->mti_mdt, rr->rr_fid1);
+ mo = mdt_object_find(info->mti_env, info->mti_mdt, rr->rr_fid1,
+ MDT_OBJ_MUST_EXIST);
if (IS_ERR(mo))
GOTO(out, rc = PTR_ERR(mo));
/* Close the found mfd, update attributes. */
ma->ma_lmm_size = info->mti_mdt->mdt_max_mdsize;
- OBD_ALLOC(ma->ma_lmm, info->mti_mdt->mdt_max_mdsize);
+ OBD_ALLOC_LARGE(ma->ma_lmm, info->mti_mdt->mdt_max_mdsize);
if (ma->ma_lmm == NULL)
GOTO(out_put, rc = -ENOMEM);
mdt_mfd_close(info, mfd);
- OBD_FREE(ma->ma_lmm, info->mti_mdt->mdt_max_mdsize);
+ OBD_FREE_LARGE(ma->ma_lmm, info->mti_mdt->mdt_max_mdsize);
} else {
rc = mdt_attr_set(info, mo, ma, rr->rr_flags);
if (rc)
out_put:
mdt_object_put(info->mti_env, mo);
out:
+ if (rc == 0)
+ mdt_counter_incr(req->rq_export, LPROC_MDT_SETATTR);
+
mdt_shrink_reply(info);
return rc;
}
static int mdt_reint_create(struct mdt_thread_info *info,
struct mdt_lock_handle *lhc)
{
- int rc;
+ struct ptlrpc_request *req = mdt_info_req(info);
+ int rc;
ENTRY;
if (OBD_FAIL_CHECK(OBD_FAIL_MDS_REINT_CREATE))
switch (info->mti_attr.ma_attr.la_mode & S_IFMT) {
case S_IFDIR:{
/* Cross-ref case. */
+ /* TODO: we can add LPROC_MDT_CROSS for cross-ref stats */
if (info->mti_cross_ref) {
rc = mdt_md_mkobj(info);
- break;
+ } else {
+ LASSERT(info->mti_rr.rr_namelen > 0);
+ mdt_counter_incr(req->rq_export, LPROC_MDT_MKDIR);
+ rc = mdt_md_create(info);
}
+ break;
}
case S_IFREG:
case S_IFLNK:
case S_IFSOCK:{
/* Special file should stay on the same node as parent. */
LASSERT(info->mti_rr.rr_namelen > 0);
+ mdt_counter_incr(req->rq_export, LPROC_MDT_MKNOD);
rc = mdt_md_create(info);
break;
}
/*
* VBR: save parent version in reply and child version getting by its name.
- * Version of child is getting and checking during its lookup. If
+ * Version of child is getting and checking during its lookup. If
*/
static int mdt_reint_unlink(struct mdt_thread_info *info,
struct mdt_lock_handle *lhc)
rr->rr_namelen);
}
mp = mdt_object_find_lock(info, rr->rr_fid1, parent_lh,
- MDS_INODELOCK_UPDATE);
+ MDS_INODELOCK_UPDATE, MDT_OBJ_MUST_EXIST);
if (IS_ERR(mp)) {
rc = PTR_ERR(mp);
/* errors are possible here in cross-ref cases, see below */
GOTO(out_unlock_parent, rc);
/* We will lock the child regardless it is local or remote. No harm. */
- mc = mdt_object_find(info->mti_env, info->mti_mdt, child_fid);
+ mc = mdt_object_find(info->mti_env, info->mti_mdt, child_fid,
+ MDT_OBJ_MUST_EXIST);
if (IS_ERR(mc))
GOTO(out_unlock_parent, rc = PTR_ERR(mc));
child_lh = &info->mti_lh[MDT_LH_CHILD];
if (rc == 0)
mdt_handle_last_unlink(info, mc, ma);
+ if (ma->ma_valid & MA_INODE) {
+ switch (ma->ma_attr.la_mode & S_IFMT) {
+ case S_IFDIR:
+ mdt_counter_incr(req->rq_export, LPROC_MDT_RMDIR);
+ break;
+ case S_IFREG:
+ case S_IFLNK:
+ case S_IFCHR:
+ case S_IFBLK:
+ case S_IFIFO:
+ case S_IFSOCK:
+ mdt_counter_incr(req->rq_export, LPROC_MDT_UNLINK);
+ break;
+ default:
+ LASSERTF(0, "bad file type %o unlinking\n",
+ ma->ma_attr.la_mode);
+ }
+ }
+
EXIT;
mdt_object_unlock_put(info, mc, child_lh, rc);
lhs = &info->mti_lh[MDT_LH_CHILD];
mdt_lock_reg_init(lhs, LCK_EX);
ms = mdt_object_find_lock(info, rr->rr_fid1, lhs,
- MDS_INODELOCK_UPDATE);
+ MDS_INODELOCK_UPDATE,
+ MDT_OBJ_MUST_EXIST);
if (IS_ERR(ms))
RETURN(PTR_ERR(ms));
mdt_lock_pdo_init(lhp, LCK_PW, rr->rr_name,
rr->rr_namelen);
mp = mdt_object_find_lock(info, rr->rr_fid2, lhp,
- MDS_INODELOCK_UPDATE);
+ MDS_INODELOCK_UPDATE, MDT_OBJ_MUST_EXIST);
if (IS_ERR(mp))
RETURN(PTR_ERR(mp));
lhs = &info->mti_lh[MDT_LH_CHILD];
mdt_lock_reg_init(lhs, LCK_EX);
- ms = mdt_object_find(info->mti_env, info->mti_mdt, rr->rr_fid1);
+ ms = mdt_object_find(info->mti_env, info->mti_mdt, rr->rr_fid1,
+ MDT_OBJ_MUST_EXIST);
if (IS_ERR(ms))
GOTO(out_unlock_parent, rc = PTR_ERR(ms));
rc = mdo_link(info->mti_env, mdt_object_child(mp),
mdt_object_child(ms), lname, ma);
+ if (rc == 0)
+ mdt_counter_incr(req->rq_export, LPROC_MDT_LINK);
+
EXIT;
out_unlock_child:
mdt_object_unlock_put(info, ms, lhs, rc);
mdt_lock_pdo_init(lh_tgtdir, LCK_PW, rr->rr_tgt,
rr->rr_tgtlen);
mtgtdir = mdt_object_find_lock(info, rr->rr_fid1, lh_tgtdir,
- MDS_INODELOCK_UPDATE);
+ MDS_INODELOCK_UPDATE,
+ MDT_OBJ_MUST_EXIST);
if (IS_ERR(mtgtdir))
RETURN(PTR_ERR(mtgtdir));
mdt_lock_reg_init(lh_tgt, LCK_EX);
mtgt = mdt_object_find_lock(info, tgt_fid, lh_tgt,
- MDS_INODELOCK_LOOKUP);
+ MDS_INODELOCK_LOOKUP,
+ MDT_OBJ_MUST_EXIST);
if (IS_ERR(mtgt))
GOTO(out_unlock_tgtdir, rc = PTR_ERR(mtgt));
do {
LASSERT(fid_is_sane(&dst_fid));
- dst = mdt_object_find(info->mti_env, info->mti_mdt, &dst_fid);
+ dst = mdt_object_find(info->mti_env, info->mti_mdt, &dst_fid,
+ MDT_OBJ_MUST_EXIST);
if (!IS_ERR(dst)) {
rc = mdo_is_subdir(info->mti_env,
mdt_object_child(dst), fid,
mdt_lock_pdo_init(lh_srcdirp, LCK_PW, rr->rr_name,
rr->rr_namelen);
msrcdir = mdt_object_find_lock(info, rr->rr_fid1, lh_srcdirp,
- MDS_INODELOCK_UPDATE);
+ MDS_INODELOCK_UPDATE,
+ MDT_OBJ_MUST_EXIST);
if (IS_ERR(msrcdir))
GOTO(out_rename_lock, rc = PTR_ERR(msrcdir));
}
} else {
mtgtdir = mdt_object_find(info->mti_env, info->mti_mdt,
- rr->rr_fid2);
+ rr->rr_fid2, MDT_OBJ_MUST_EXIST);
if (IS_ERR(mtgtdir))
GOTO(out_unlock_source, rc = PTR_ERR(mtgtdir));
if (rc)
GOTO(out_put_target, rc);
- rc = mdt_object_exists(mtgtdir);
- if (rc == 0) {
- GOTO(out_put_target, rc = -ESTALE);
- } else if (rc > 0) {
+ if (mdt_object_exists(mtgtdir) > 0) {
/* we lock the target dir if it is local */
rc = mdt_object_lock(info, mtgtdir, lh_tgtdirp,
MDS_INODELOCK_UPDATE,
if (lu_fid_eq(old_fid, rr->rr_fid1) || lu_fid_eq(old_fid, rr->rr_fid2))
GOTO(out_unlock_target, rc = -EINVAL);
- mold = mdt_object_find(info->mti_env, info->mti_mdt, old_fid);
+ mold = mdt_object_find(info->mti_env, info->mti_mdt, old_fid,
+ MDT_OBJ_MUST_EXIST);
if (IS_ERR(mold))
GOTO(out_unlock_target, rc = PTR_ERR(mold));
GOTO(out_unlock_old, rc = -EINVAL);
mdt_lock_reg_init(lh_newp, LCK_EX);
- mnew = mdt_object_find(info->mti_env, info->mti_mdt, new_fid);
+ mnew = mdt_object_find(info->mti_env, info->mti_mdt, new_fid,
+ MDT_OBJ_MAY_NOT_EXIST);
if (IS_ERR(mnew))
GOTO(out_unlock_old, rc = PTR_ERR(mnew));
lname, ma);
/* handle last link of tgt object */
- if (rc == 0 && mnew)
- mdt_handle_last_unlink(info, mnew, ma);
+ if (rc == 0) {
+ mdt_counter_incr(req->rq_export, LPROC_MDT_RENAME);
+ if (mnew)
+ mdt_handle_last_unlink(info, mnew, ma);
+ }
EXIT;
out_unlock_new:
git://git.whamcloud.com / fs / lustre-release.git / blobdiff