X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fliblustre%2Fnamei.c;fp=lustre%2Fliblustre%2Fnamei.c;h=23d6843f239518f757f36e78c087120907a80453;hp=c129f0b85ebdb8559bbbfe3d6baf233fd7ab5f60;hb=26422c384c301ec81345292fd30e5924c37305b6;hpb=a2877f1f6c0fd0ec5ece836a216f42af3ef913da;ds=sidebyside diff --git a/lustre/liblustre/namei.c b/lustre/liblustre/namei.c index c129f0b..23d6843 100644 --- a/lustre/liblustre/namei.c +++ b/lustre/liblustre/namei.c @@ -263,8 +263,9 @@ 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, it, &req, &llu_md_blocking_ast, - LDLM_FL_CANCEL_ON_BLOCK); + rc = md_intent_lock(exp, &op_data, NULL, 0, it, flags, + &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) @@ -428,8 +429,9 @@ static int llu_lookup_it(struct inode *parent, struct pnode *pnode, pnode->p_base->pb_name.name, pnode->p_base->pb_name.len, flags, opc); - rc = md_intent_lock(llu_i2mdexp(parent), &op_data, it, &req, - &llu_md_blocking_ast, LDLM_FL_CANCEL_ON_BLOCK); + rc = md_intent_lock(llu_i2mdexp(parent), &op_data, NULL, 0, it, + flags, &req, llu_md_blocking_ast, + LDLM_FL_CANCEL_ON_BLOCK); if (rc < 0) GOTO(out, rc);