Branch: b_release_1_4_6

r=adilger

Make llu_dir_do_readpage to match LCK_CR locks to conform to inodebits new
locking policy.

diff --git a/lustre/liblustre/dir.c b/lustre/liblustre/dir.c
index 591b434..5ce8a64 100644 (file)
--- a/lustre/liblustre/dir.c
+++ b/lustre/liblustre/dir.c
@@ -82,11 +82,11 @@ static int llu_dir_do_readpage(struct inode *inode, struct page *page)
         ENTRY;
 
         rc = ldlm_lock_match(obddev->obd_namespace, LDLM_FL_BLOCK_GRANTED,
-                             &res_id, LDLM_IBITS, &policy, LCK_PR, &lockh);
+                             &res_id, LDLM_IBITS, &policy, LCK_CR, &lockh);
         if (!rc) {
                 llu_prepare_mdc_op_data(&data, inode, NULL, NULL, 0, 0);
 
-                rc = mdc_enqueue(sbi->ll_mdc_exp, LDLM_IBITS, &it, LCK_PR,
+                rc = mdc_enqueue(sbi->ll_mdc_exp, LDLM_IBITS, &it, LCK_CR,
                                  &data, &lockh, NULL, 0,
                                  ldlm_completion_ast, llu_mdc_blocking_ast,
                                  inode, LDLM_FL_CANCEL_ON_BLOCK);
@@ -117,7 +117,7 @@ static int llu_dir_do_readpage(struct inode *inode, struct page *page)
         ptlrpc_req_finished(request);
         EXIT;
 
-        ldlm_lock_decref(&lockh, LCK_PR);
+        ldlm_lock_decref(&lockh, LCK_CR);
         return rc;
 }