Branch HEAD

[fs/lustre-release.git] / lustre / liblustre / dir.c

diff --git a/lustre/liblustre/dir.c b/lustre/liblustre/dir.c
index dc56597..0f2bc90 100644 (file)
--- a/lustre/liblustre/dir.c
+++ b/lustre/liblustre/dir.c
@@ -74,16 +74,11 @@ static int llu_dir_do_readpage(struct inode *inode, struct page *page)
         struct mdt_body *body;
         struct lookup_intent it = { .it_op = IT_READDIR };
         struct md_op_data op_data;
-        struct obd_device *obddev = class_exp2obd(sbi->ll_md_exp);
-        struct ldlm_res_id res_id =
-                { .name = {fid_seq(&lli->lli_fid), 
-                           fid_oid(&lli->lli_fid), 
-                           fid_ver(&lli->lli_fid)} };
         ldlm_policy_data_t policy = { .l_inodebits = { MDS_INODELOCK_UPDATE } };
         ENTRY;
 
-        rc = ldlm_lock_match(obddev->obd_namespace, LDLM_FL_BLOCK_GRANTED,
-                             &res_id, LDLM_IBITS, &policy, LCK_CR, &lockh);
+        rc = md_lock_match(sbi->ll_md_exp, LDLM_FL_BLOCK_GRANTED,
+                           &lli->lli_fid, LDLM_IBITS, &policy, LCK_CR, &lockh);
         if (!rc) {
                 struct ldlm_enqueue_info einfo = {LDLM_IBITS, LCK_CR,
                         llu_md_blocking_ast, ldlm_completion_ast, NULL, inode};
@@ -112,7 +107,7 @@ static int llu_dir_do_readpage(struct inode *inode, struct page *page)
                                       sizeof(*body));
                 LASSERT(body != NULL);         /* checked by md_readpage() */
                 /* swabbed by md_readpage() */
-                LASSERT_REPSWABBED(request, REPLY_REC_OFF);
+                LASSERT(lustre_rep_swabbed(request, REPLY_REC_OFF));
 
                 st->st_size = body->size;
         } else {