Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f10a4cf
)
b=20433 we should recycle dentries and inodes if only cancelling locks existing
author
Landen
<landen@sun.com>
Tue, 27 Jul 2010 11:11:04 +0000
(15:11 +0400)
committer
Mikhail Pershin
<tappro@sun.com>
Wed, 28 Jul 2010 13:25:32 +0000
(17:25 +0400)
i=green
i=adilger
lustre/llite/dcache.c
patch
|
blob
|
history
diff --git
a/lustre/llite/dcache.c
b/lustre/llite/dcache.c
index
6f1698c
..
13c4d98
100644
(file)
--- a/
lustre/llite/dcache.c
+++ b/
lustre/llite/dcache.c
@@
-116,6
+116,8
@@
int ll_dcompare(struct dentry *parent, struct qstr *d_name, struct qstr *name)
static inline int return_if_equal(struct ldlm_lock *lock, void *data)
{
static inline int return_if_equal(struct ldlm_lock *lock, void *data)
{
+ if (lock->l_flags & LDLM_FL_CANCELING)
+ return LDLM_ITER_CONTINUE;
return LDLM_ITER_STOP;
}
return LDLM_ITER_STOP;
}