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
LU-2144 utils: reset 'optind' to avoid segmentation fault
[fs/lustre-release.git]
/
lustre
/
ldlm
/
l_lock.c
diff --git
a/lustre/ldlm/l_lock.c
b/lustre/ldlm/l_lock.c
index
ce2bdad
..
d1de7d1
100644
(file)
--- a/
lustre/ldlm/l_lock.c
+++ b/
lustre/ldlm/l_lock.c
@@
-1,6
+1,4
@@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
* GPL HEADER START
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* GPL HEADER START
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@
-52,29
+50,22
@@
*/
struct ldlm_resource * lock_res_and_lock(struct ldlm_lock *lock)
{
*/
struct ldlm_resource * lock_res_and_lock(struct ldlm_lock *lock)
{
- struct ldlm_resource *res = NULL;
+ /* on server-side resource of lock doesn't change */
+ if (!lock->l_ns_srv)
+ cfs_spin_lock(&lock->l_lock);
- cfs_spin_lock(&lock->l_lock);
- res = lock->l_resource;
+ lock_res(lock->l_resource);
- if (ns_is_server(res->lr_namespace))
- /* on server-side resource of lock doesn't change */
- cfs_spin_unlock(&lock->l_lock);
-
- lock_res(res);
- return res;
+ lock->l_res_locked = 1;
+ return lock->l_resource;
}
void unlock_res_and_lock(struct ldlm_lock *lock)
{
}
void unlock_res_and_lock(struct ldlm_lock *lock)
{
- struct ldlm_resource *res = lock->l_resource;
-
- if (ns_is_server(res->lr_namespace)) {
- /* on server-side resource of lock doesn't change */
- unlock_res(res);
- return;
- }
+ /* on server-side resource of lock doesn't change */
+ lock->l_res_locked = 0;
- unlock_res(res);
- cfs_spin_unlock(&lock->l_lock);
+ unlock_res(lock->l_resource);
+ if (!lock->l_ns_srv)
+ cfs_spin_unlock(&lock->l_lock);
}
}