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
Branch HEAD
[fs/lustre-release.git]
/
lustre
/
ldlm
/
ldlm_lock.c
diff --git
a/lustre/ldlm/ldlm_lock.c
b/lustre/ldlm/ldlm_lock.c
index
d9921b5
..
096bf9b
100644
(file)
--- a/
lustre/ldlm/ldlm_lock.c
+++ b/
lustre/ldlm/ldlm_lock.c
@@
-270,8
+270,8
@@
int ldlm_lock_destroy_internal(struct ldlm_lock *lock)
if (lock->l_export && lock->l_export->exp_lock_hash &&
!hlist_unhashed(&lock->l_exp_hash))
if (lock->l_export && lock->l_export->exp_lock_hash &&
!hlist_unhashed(&lock->l_exp_hash))
-
lustre
_hash_del(lock->l_export->exp_lock_hash,
-
&lock->l_remote_handle, &lock->l_exp_hash);
+
cfs
_hash_del(lock->l_export->exp_lock_hash,
+ &lock->l_remote_handle, &lock->l_exp_hash);
ldlm_lock_remove_from_lru(lock);
class_handle_unhash(&lock->l_handle);
ldlm_lock_remove_from_lru(lock);
class_handle_unhash(&lock->l_handle);
@@
-1685,8
+1685,8
@@
void ldlm_cancel_locks_for_export_cb(void *obj, void *data)
void ldlm_cancel_locks_for_export(struct obd_export *exp)
{
void ldlm_cancel_locks_for_export(struct obd_export *exp)
{
-
lustre
_hash_for_each_empty(exp->exp_lock_hash,
-
ldlm_cancel_locks_for_export_cb, exp);
+
cfs
_hash_for_each_empty(exp->exp_lock_hash,
+ ldlm_cancel_locks_for_export_cb, exp);
}
/**
}
/**