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-6368 ldlm: Do not use cbpending for group locks
[fs/lustre-release.git]
/
lustre
/
ldlm
/
l_lock.c
diff --git
a/lustre/ldlm/l_lock.c
b/lustre/ldlm/l_lock.c
index
8831b39
..
6f3f859
100644
(file)
--- a/
lustre/ldlm/l_lock.c
+++ b/
lustre/ldlm/l_lock.c
@@
-26,6
+26,8
@@
/*
* Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
/*
* Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
+ *
+ * Copyright (c) 2012, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
/*
* This file is part of Lustre, http://www.lustre.org/
@@
-33,11
+35,7
@@
*/
#define DEBUG_SUBSYSTEM S_LDLM
*/
#define DEBUG_SUBSYSTEM S_LDLM
-#ifdef __KERNEL__
#include <libcfs/libcfs.h>
#include <libcfs/libcfs.h>
-#else
-#include <liblustre.h>
-#endif
#include <lustre_dlm.h>
#include <lustre_lib.h>
#include <lustre_dlm.h>
#include <lustre_lib.h>
@@
-53,12
+51,12
@@
struct ldlm_resource *lock_res_and_lock(struct ldlm_lock *lock)
{
/* on server-side resource of lock doesn't change */
struct ldlm_resource *lock_res_and_lock(struct ldlm_lock *lock)
{
/* on server-side resource of lock doesn't change */
- if (!l
ock->l_ns_srv
)
+ if (!l
dlm_is_ns_srv(lock)
)
spin_lock(&lock->l_lock);
lock_res(lock->l_resource);
spin_lock(&lock->l_lock);
lock_res(lock->l_resource);
- l
ock->l_res_locked = 1
;
+ l
dlm_set_res_locked(lock)
;
return lock->l_resource;
}
EXPORT_SYMBOL(lock_res_and_lock);
return lock->l_resource;
}
EXPORT_SYMBOL(lock_res_and_lock);
@@
-69,10
+67,10
@@
EXPORT_SYMBOL(lock_res_and_lock);
void unlock_res_and_lock(struct ldlm_lock *lock)
{
/* on server-side resource of lock doesn't change */
void unlock_res_and_lock(struct ldlm_lock *lock)
{
/* on server-side resource of lock doesn't change */
- l
ock->l_res_locked = 0
;
+ l
dlm_clear_res_locked(lock)
;
unlock_res(lock->l_resource);
unlock_res(lock->l_resource);
- if (!l
ock->l_ns_srv
)
+ if (!l
dlm_is_ns_srv(lock)
)
spin_unlock(&lock->l_lock);
}
EXPORT_SYMBOL(unlock_res_and_lock);
spin_unlock(&lock->l_lock);
}
EXPORT_SYMBOL(unlock_res_and_lock);