Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
b=13872
[fs/lustre-release.git]
/
lustre
/
ldlm
/
l_lock.c
diff --git
a/lustre/ldlm/l_lock.c
b/lustre/ldlm/l_lock.c
index
63f2ad5
..
e23a755
100644
(file)
--- a/
lustre/ldlm/l_lock.c
+++ b/
lustre/ldlm/l_lock.c
@@
-43,13
+43,13
@@
struct ldlm_resource * lock_res_and_lock(struct ldlm_lock *lock)
{
struct ldlm_resource *res = lock->l_resource;
{
struct ldlm_resource *res = lock->l_resource;
- if (
!res->lr_namespace->ns_client
) {
+ if (
ns_is_server(res->lr_namespace)
) {
/* on server-side resource of lock doesn't change */
lock_res(res);
return res;
}
/* on server-side resource of lock doesn't change */
lock_res(res);
return res;
}
-
lock_bitlock(
lock);
+
spin_lock(&lock->l_
lock);
res = lock->l_resource;
lock_res(res);
return res;
res = lock->l_resource;
lock_res(res);
return res;
@@
-59,13
+59,13
@@
void unlock_res_and_lock(struct ldlm_lock *lock)
{
struct ldlm_resource *res = lock->l_resource;
{
struct ldlm_resource *res = lock->l_resource;
- if (
!res->lr_namespace->ns_client
) {
+ if (
ns_is_server(res->lr_namespace)
) {
/* on server-side resource of lock doesn't change */
unlock_res(res);
return;
}
unlock_res(res);
/* on server-side resource of lock doesn't change */
unlock_res(res);
return;
}
unlock_res(res);
-
unlock_bitlock(
lock);
+
spin_unlock(&lock->l_
lock);
}
}