X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fliblustre%2Fnamei.c;h=c129f0b85ebdb8559bbbfe3d6baf233fd7ab5f60;hp=480518018510eae51a06821cc4a458c5ca34a904;hb=8d161d44214f907a9f2d9cf5a79cd2c83de995c3;hpb=a5b81807c5d6d2cb3b2ef1a0a7e150ee6002f7f7 diff --git a/lustre/liblustre/namei.c b/lustre/liblustre/namei.c index 4805180..c129f0b 100644 --- a/lustre/liblustre/namei.c +++ b/lustre/liblustre/namei.c @@ -1,6 +1,4 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * +/* * GPL HEADER START * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +26,8 @@ /* * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. + * + * Copyright (c) 2011, 2012, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -40,18 +40,27 @@ #define DEBUG_SUBSYSTEM S_LLITE +#include +#include +#include #include #include -#include -#include -#include #include -#include -#include - +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "llite_lib.h" -void ll_intent_drop_lock(struct lookup_intent *it) +static void ll_intent_drop_lock(struct lookup_intent *it) { struct lustre_handle *handle; @@ -67,7 +76,7 @@ void ll_intent_drop_lock(struct lookup_intent *it) } } -void ll_intent_release(struct lookup_intent *it) +static void ll_intent_release(struct lookup_intent *it) { ENTRY; @@ -79,7 +88,8 @@ void ll_intent_release(struct lookup_intent *it) EXIT; } -void llu_lookup_finish_locks(struct lookup_intent *it, struct pnode *pnode) +static void +llu_lookup_finish_locks(struct lookup_intent *it, struct pnode *pnode) { struct inode *inode; LASSERT(it); @@ -121,19 +131,23 @@ int llu_md_blocking_ast(struct ldlm_lock *lock, switch (flag) { case LDLM_CB_BLOCKING: ldlm_lock2handle(lock, &lockh); - rc = ldlm_cli_cancel(&lockh); + rc = ldlm_cli_cancel(&lockh, 0); if (rc < 0) { CDEBUG(D_INODE, "ldlm_cli_cancel: %d\n", rc); RETURN(rc); } break; case LDLM_CB_CANCELING: { - struct inode *inode = llu_inode_from_lock(lock); + struct inode *inode = llu_inode_from_resource_lock(lock); struct llu_inode_info *lli; struct intnl_stat *st; __u64 bits = lock->l_policy_data.l_inodebits.bits; struct lu_fid *fid; + /* Inode is set to lock->l_resource->lr_lvb_inode + * for mdc - bug 24555 */ + LASSERT(lock->l_ast_data == NULL); + /* Invalidate all dentries associated with this inode */ if (inode == NULL) break; @@ -144,15 +158,10 @@ int llu_md_blocking_ast(struct ldlm_lock *lock, if (bits & MDS_INODELOCK_UPDATE) lli->lli_flags &= ~LLIF_MDS_SIZE_LOCK; - fid = &lli->lli_fid; - if (lock->l_resource->lr_name.name[0] != fid_seq(fid) || - lock->l_resource->lr_name.name[1] != fid_oid(fid) || - lock->l_resource->lr_name.name[2] != fid_ver(fid)) { - LDLM_ERROR(lock,"data mismatch with ino %llu/%llu/%llu", - (long long)fid_seq(fid), - (long long)fid_oid(fid), - (long long)fid_ver(fid)); - } + fid = &lli->lli_fid; + if (!fid_res_name_eq(fid, &lock->l_resource->lr_name)) + LDLM_ERROR(lock, "data mismatch with object " + DFID" (%p)", PFID(fid), inode); if (S_ISDIR(st->st_mode) && (bits & MDS_INODELOCK_UPDATE)) { CDEBUG(D_INODE, "invalidating inode %llu\n", @@ -254,9 +263,8 @@ static int llu_pb_revalidate(struct pnode *pnode, int flags, pb->pb_ino, pb->pb_name.name, pb->pb_name.len, 0, LUSTRE_OPC_ANY); - rc = md_intent_lock(exp, &op_data, NULL, 0, it, flags, - &req, llu_md_blocking_ast, - LDLM_FL_CANCEL_ON_BLOCK); + rc = md_intent_lock(exp, &op_data, it, &req, &llu_md_blocking_ast, + LDLM_FL_CANCEL_ON_BLOCK); /* If req is NULL, then md_intent_lock only tried to do a lock match; * if all was well, it will return 1 if it found locks, 0 otherwise. */ if (req == NULL && rc >= 0) @@ -291,11 +299,9 @@ static int llu_pb_revalidate(struct pnode *pnode, int flags, } static int lookup_it_finish(struct ptlrpc_request *request, int offset, - struct lookup_intent *it, void *data) + struct lookup_intent *it, + struct inode *parent, struct pnode *child) { - struct it_cb_data *icbd = data; - struct pnode *child = icbd->icbd_child; - struct inode *parent = icbd->icbd_parent; struct llu_sb_info *sbi = llu_i2sbi(parent); struct inode *inode = NULL; int rc; @@ -315,10 +321,10 @@ static int lookup_it_finish(struct ptlrpc_request *request, int offset, /* undo which did by md_intent_lock */ if (it_disposition(it, DISP_OPEN_CREATE) && !it_open_error(DISP_OPEN_CREATE, it)) { - LASSERT(request); - LASSERT(cfs_atomic_read(&request->rq_refcount) > 1); - CDEBUG(D_INODE, "dec a ref of req %p\n", request); - ptlrpc_req_finished(request); + LASSERT(request); + LASSERT(atomic_read(&request->rq_refcount) > 1); + CDEBUG(D_INODE, "dec a ref of req %p\n", request); + ptlrpc_req_finished(request); } return it_open_error(DISP_OPEN_OPEN, it); } @@ -346,8 +352,7 @@ static int lookup_it_finish(struct ptlrpc_request *request, int offset, if (md.lsm != NULL) obd_free_memmd(sbi->ll_dt_exp, &md.lsm); RETURN(inode ? PTR_ERR(inode) : -ENOMEM); - } else if (md.lsm != NULL && - llu_i2info(inode)->lli_smd != md.lsm) { + } else if (md.lsm != NULL) { obd_free_memmd(sbi->ll_dt_exp, &md.lsm); } @@ -356,12 +361,9 @@ static int lookup_it_finish(struct ptlrpc_request *request, int offset, /* If this is a stat, get the authoritative file size */ if (it->it_op == IT_GETATTR && S_ISREG(st->st_mode) && - lli->lli_smd != NULL) { - struct lov_stripe_md *lsm = lli->lli_smd; + lli->lli_has_smd) { ldlm_error_t rc; - LASSERT(lsm->lsm_object_id != 0); - /* bug 2334: drop MDS lock before acquiring OST lock */ ll_intent_drop_lock(it); @@ -384,26 +386,25 @@ static int lookup_it_finish(struct ptlrpc_request *request, int offset, RETURN(0); } -struct inode *llu_inode_from_lock(struct ldlm_lock *lock) +struct inode *llu_inode_from_resource_lock(struct ldlm_lock *lock) { - struct inode *inode; - lock_res_and_lock(lock); + struct inode *inode; + lock_res_and_lock(lock); - if (lock->l_ast_data) { - inode = (struct inode *)lock->l_ast_data; - I_REF(inode); - } else - inode = NULL; + if (lock->l_resource->lr_lvb_inode) { + inode = (struct inode *)lock->l_resource->lr_lvb_inode; + I_REF(inode); + } else + inode = NULL; - unlock_res_and_lock(lock); - return inode; + unlock_res_and_lock(lock); + return inode; } static int llu_lookup_it(struct inode *parent, struct pnode *pnode, struct lookup_intent *it, int flags) { struct md_op_data op_data = {{ 0 }}; - struct it_cb_data icbd; struct ptlrpc_request *req = NULL; struct lookup_intent lookup_it = { .it_op = IT_LOOKUP }; __u32 opc; @@ -418,27 +419,21 @@ static int llu_lookup_it(struct inode *parent, struct pnode *pnode, it->it_op_release = ll_intent_release; } - icbd.icbd_child = pnode; - icbd.icbd_parent = parent; + if (it->it_op & IT_CREAT) + opc = LUSTRE_OPC_CREATE; + else + opc = LUSTRE_OPC_ANY; - if (it->it_op & IT_CREAT || - (it->it_op & IT_OPEN && it->it_create_mode & O_CREAT)) { - opc = LUSTRE_OPC_CREATE; - } else { - opc = LUSTRE_OPC_ANY; - } - llu_prep_md_op_data(&op_data, parent, NULL, pnode->p_base->pb_name.name, pnode->p_base->pb_name.len, flags, opc); - rc = md_intent_lock(llu_i2mdexp(parent), &op_data, NULL, 0, it, - flags, &req, llu_md_blocking_ast, - LDLM_FL_CANCEL_ON_BLOCK); + rc = md_intent_lock(llu_i2mdexp(parent), &op_data, it, &req, + &llu_md_blocking_ast, LDLM_FL_CANCEL_ON_BLOCK); if (rc < 0) GOTO(out, rc); - rc = lookup_it_finish(req, DLM_REPLY_REC_OFF, it, &icbd); + rc = lookup_it_finish(req, DLM_REPLY_REC_OFF, it, parent, pnode); if (rc != 0) { ll_intent_release(it); GOTO(out, rc);