From b4b0aa4d768e97043e679379fd69586f00c537e2 Mon Sep 17 00:00:00 2001
From: alex <alex>
Date: Tue, 20 Jun 2006 16:31:09 +0000
Subject: [PATCH] - missed to fix ns_lock in liblustre

---
 lustre/liblustre/namei.c | 4 ++--
 lustre/liblustre/rw.c    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lustre/liblustre/namei.c b/lustre/liblustre/namei.c
index f4b19ee..a8c5418 100644
--- a/lustre/liblustre/namei.c
+++ b/lustre/liblustre/namei.c
@@ -400,7 +400,7 @@ static int lookup_it_finish(struct ptlrpc_request *request, int offset,
 struct inode *llu_inode_from_lock(struct ldlm_lock *lock)
 {
         struct inode *inode;
-        l_lock(&lock->l_resource->lr_namespace->ns_lock);
+        lock_res_and_lock(lock);
 
         if (lock->l_ast_data) {
                 inode = (struct inode *)lock->l_ast_data;
@@ -408,7 +408,7 @@ struct inode *llu_inode_from_lock(struct ldlm_lock *lock)
         } else
                 inode = NULL;
 
-        l_unlock(&lock->l_resource->lr_namespace->ns_lock);
+        unlock_res_and_lock(lock);
         return inode;
 }
 
diff --git a/lustre/liblustre/rw.c b/lustre/liblustre/rw.c
index ee43f1f..85de234 100644
--- a/lustre/liblustre/rw.c
+++ b/lustre/liblustre/rw.c
@@ -154,10 +154,10 @@ static int llu_extent_lock_callback(struct ldlm_lock *lock,
                 lsm = lli->lli_smd;
 
                 stripe = llu_lock_to_stripe_offset(inode, lock);
-                l_lock(&lock->l_resource->lr_namespace->ns_lock);
+                lock_res_and_lock(lock);
                 kms = ldlm_extent_shift_kms(lock,
                                             lsm->lsm_oinfo[stripe].loi_kms);
-                l_unlock(&lock->l_resource->lr_namespace->ns_lock);
+                unlock_res_and_lock(lock);
                 if (lsm->lsm_oinfo[stripe].loi_kms != kms)
                         LDLM_DEBUG(lock, "updating kms from "LPU64" to "LPU64,
                                    lsm->lsm_oinfo[stripe].loi_kms, kms);
-- 
1.8.3.1