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
Update based on lustre-iokit-20051107.tar.gz from the customer download area.
[fs/lustre-release.git]
/
lustre
/
ldlm
/
l_lock.c
diff --git
a/lustre/ldlm/l_lock.c
b/lustre/ldlm/l_lock.c
index
fb41ccb
..
b652097
100644
(file)
--- a/
lustre/ldlm/l_lock.c
+++ b/
lustre/ldlm/l_lock.c
@@
-64,21
+64,12
@@
struct ldlm_resource * lock_res_and_lock(struct ldlm_lock *lock)
return res;
}
return res;
}
- bit_spin_lock(LDLM_FL_LOCK_PROTECT_BIT, (void *) &lock->l_flags);
- LASSERT(lock->l_pidb == 0);
+ lock_bitlock(lock);
res = lock->l_resource;
res = lock->l_resource;
- lock->l_pidb = current->pid;
lock_res(res);
return res;
}
lock_res(res);
return res;
}
-void unlock_bitlock(struct ldlm_lock *lock)
-{
- LASSERT(lock->l_pidb == current->pid);
- lock->l_pidb = 0;
- bit_spin_unlock(LDLM_FL_LOCK_PROTECT_BIT, (void *) &lock->l_flags);
-}
-
void unlock_res_and_lock(struct ldlm_lock *lock)
{
struct ldlm_resource *res = lock->l_resource;
void unlock_res_and_lock(struct ldlm_lock *lock)
{
struct ldlm_resource *res = lock->l_resource;