X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmdt%2Fmdt_reint.c;h=9922b82f27bfca6f2363ebfda63594e340b3afb4;hb=ed5e47ac21b02abb16b10446dac7dae722259f0a;hp=3ffd2e6692985746524a0689d1ad8c4cfd64ff18;hpb=242b61e4bd464cd517636c33f63ba707af69e945;p=fs%2Flustre-release.git diff --git a/lustre/mdt/mdt_reint.c b/lustre/mdt/mdt_reint.c index 3ffd2e6..9922b82 100644 --- a/lustre/mdt/mdt_reint.c +++ b/lustre/mdt/mdt_reint.c @@ -26,8 +26,11 @@ * 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/ @@ -107,7 +110,7 @@ static void mdt_obj_version_get(struct mdt_thread_info *info, LASSERT(o); LASSERT(mdt_object_exists(o) >= 0); if (mdt_object_exists(o) > 0) - *version = mo_version_get(info->mti_env, mdt_object_child(o)); + *version = dt_version_get(info->mti_env, mdt_obj2dt(o)); else *version = ENOENT_VERSION; CDEBUG(D_INODE, "FID "DFID" version is "LPX64"\n", @@ -411,16 +414,12 @@ static int mdt_md_mkobj(struct mdt_thread_info *info) RETURN(rc); } -/* In the raw-setattr case, we lock the child inode. - * In the write-back case or if being called from open, - * the client holds a lock already. - * We use the ATTR_FROM_OPEN (translated into MRF_SETATTR_LOCKED by - * mdt_setattr_unpack()) flag to tell these cases apart. */ int mdt_attr_set(struct mdt_thread_info *info, struct mdt_object *mo, struct md_attr *ma, int flags) { struct mdt_lock_handle *lh; int do_vbr = ma->ma_attr.la_valid & (LA_MODE|LA_UID|LA_GID|LA_FLAGS); + __u64 lockpart = MDS_INODELOCK_UPDATE; int rc; ENTRY; @@ -430,15 +429,12 @@ int mdt_attr_set(struct mdt_thread_info *info, struct mdt_object *mo, lh = &info->mti_lh[MDT_LH_PARENT]; mdt_lock_reg_init(lh, LCK_PW); - if (!(flags & MRF_SETATTR_LOCKED)) { - __u64 lockpart = MDS_INODELOCK_UPDATE; - if (ma->ma_attr.la_valid & (LA_MODE|LA_UID|LA_GID)) - lockpart |= MDS_INODELOCK_LOOKUP; + if (ma->ma_attr.la_valid & (LA_MODE|LA_UID|LA_GID)) + lockpart |= MDS_INODELOCK_LOOKUP; - rc = mdt_object_lock(info, mo, lh, lockpart, MDT_LOCAL_LOCK); - if (rc != 0) - RETURN(rc); - } + rc = mdt_object_lock(info, mo, lh, lockpart, MDT_LOCAL_LOCK); + if (rc != 0) + RETURN(rc); if (mdt_object_exists(mo) == 0) GOTO(out_unlock, rc = -ENOENT); @@ -499,7 +495,7 @@ static int mdt_reint_setattr(struct mdt_thread_info *info, /* start a log jounal handle if needed */ if (!(mdt_conn_flags(info) & OBD_CONNECT_SOM)) { if ((ma->ma_attr.la_valid & LA_SIZE) || - (rr->rr_flags & MRF_SETATTR_LOCKED)) { + (rr->rr_flags & MRF_OPEN_TRUNC)) { /* Check write access for the O_TRUNC case */ if (mdt_write_read(mo) < 0) GOTO(out_put, rc = -ETXTBSY); @@ -521,7 +517,7 @@ static int mdt_reint_setattr(struct mdt_thread_info *info, repbody->ioepoch = mo->mot_ioepoch; mdt_object_get(info->mti_env, mo); - mdt_mfd_set_mode(mfd, FMODE_TRUNC); + mdt_mfd_set_mode(mfd, MDS_FMODE_TRUNC); mfd->mfd_object = mo; mfd->mfd_xid = req->rq_xid; @@ -548,7 +544,7 @@ static int mdt_reint_setattr(struct mdt_thread_info *info, info->mti_ioepoch->handle.cookie); GOTO(out_put, rc = -ESTALE); } - LASSERT(mfd->mfd_mode == FMODE_SOM); + LASSERT(mfd->mfd_mode == MDS_FMODE_SOM); LASSERT(!(info->mti_ioepoch->flags & MF_EPOCH_CLOSE)); class_handle_unhash(&mfd->mfd_handle); @@ -557,13 +553,13 @@ static int mdt_reint_setattr(struct mdt_thread_info *info, /* 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) @@ -598,6 +594,10 @@ static int mdt_reint_setattr(struct mdt_thread_info *info, out_put: mdt_object_put(info->mti_env, mo); out: + if (rc == 0) + mdt_counter_incr(req->rq_export, LPROC_MDT_SETATTR); + + mdt_client_compatibility(info); mdt_shrink_reply(info); return rc; } @@ -605,7 +605,8 @@ out: 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)) @@ -617,10 +618,15 @@ static int mdt_reint_create(struct mdt_thread_info *info, 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: @@ -630,6 +636,7 @@ static int mdt_reint_create(struct mdt_thread_info *info, 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; } @@ -641,7 +648,7 @@ static int mdt_reint_create(struct mdt_thread_info *info, /* * 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) @@ -754,6 +761,25 @@ static int mdt_reint_unlink(struct mdt_thread_info *info, 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); @@ -861,6 +887,9 @@ static int mdt_reint_link(struct mdt_thread_info *info, 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); @@ -1245,8 +1274,14 @@ static int mdt_reint_rename(struct mdt_thread_info *info, 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); + + mdt_rename_counter_tally(info, info->mti_mdt, req->rq_export, + msrcdir, mtgtdir); + } EXIT; out_unlock_new: