b=20433 we should recycle dentries and inodes if only cancelling locks existing

i=green
i=adilger

diff --git a/lustre/llite/dcache.c b/lustre/llite/dcache.c
index 09779aa..e4c3762 100644 (file)
--- a/lustre/llite/dcache.c
+++ b/lustre/llite/dcache.c
@@ -113,6 +113,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)
 {
+        if (lock->l_flags & LDLM_FL_CANCELING)
+                return LDLM_ITER_CONTINUE;
         return LDLM_ITER_STOP;
 }