EXIT;
}
-void ll_invalidate_aliases(struct inode *inode)
+/* mark aliases invalid and prune unused aliases */
+void ll_prune_aliases(struct inode *inode)
{
struct dentry *dentry;
ENTRY;
PFID(ll_inode2fid(inode)), inode);
spin_lock(&inode->i_lock);
- hlist_for_each_entry(dentry, &inode->i_dentry, d_alias) {
- CDEBUG(D_DENTRY,
- "dentry in drop %pd (%p) parent %p inode %p flags %d\n",
- dentry, dentry, dentry->d_parent,
- dentry->d_inode, dentry->d_flags);
-
- d_lustre_invalidate(dentry, 0);
- }
+ hlist_for_each_entry(dentry, &inode->i_dentry, d_alias)
+ d_lustre_invalidate(dentry);
spin_unlock(&inode->i_lock);
+ d_prune_aliases(inode);
+
EXIT;
}
* do_lookup() -> ll_revalidate_it(). We cannot use d_drop
* here to preserve get_cwd functionality on 2.6.
* Bug 10503 */
- if (!dentry->d_inode->i_nlink) {
- spin_lock(&inode->i_lock);
- d_lustre_invalidate(dentry, 0);
- spin_unlock(&inode->i_lock);
- }
+ if (!dentry->d_inode->i_nlink)
+ d_lustre_invalidate(dentry);
ll_lookup_finish_locks(&oit, dentry);
out:
extern const struct dentry_operations ll_d_ops;
void ll_intent_drop_lock(struct lookup_intent *);
void ll_intent_release(struct lookup_intent *);
-void ll_invalidate_aliases(struct inode *);
+void ll_prune_aliases(struct inode *inode);
void ll_lookup_finish_locks(struct lookup_intent *it, struct dentry *dentry);
int ll_revalidate_it_finish(struct ptlrpc_request *request,
struct lookup_intent *it, struct dentry *de);
/*
* Mark dentry INVALID, if dentry refcount is zero (this is normally case for
- * ll_md_blocking_ast), unhash this dentry, and let dcache to reclaim it later;
- * else dput() of the last refcount will unhash this dentry and kill it.
+ * ll_md_blocking_ast), it will be pruned by ll_prune_aliases() and
+ * ll_prune_negative_children(); otherwise dput() of the last refcount will
+ * unhash this dentry and kill it.
*/
-static inline void d_lustre_invalidate(struct dentry *dentry, int nested)
+static inline void d_lustre_invalidate(struct dentry *dentry)
{
CDEBUG(D_DENTRY, "invalidate dentry %pd (%p) parent %p inode %p refc %d\n",
dentry, dentry,
dentry->d_parent, dentry->d_inode, ll_d_count(dentry));
- spin_lock_nested(&dentry->d_lock,
- nested ? DENTRY_D_LOCK_NESTED : DENTRY_D_LOCK_NORMAL);
+ spin_lock(&dentry->d_lock);
__d_lustre_invalidate(dentry);
- /*
- * We should be careful about dentries created by d_obtain_alias().
- * These dentries are not put in the dentry tree, instead they are
- * linked to sb->s_anon through dentry->d_hash.
- * shrink_dcache_for_umount() shrinks the tree and sb->s_anon list.
- * If we unhashed such a dentry, unmount would not be able to find
- * it and busy inodes would be reported.
- */
- if (ll_d_count(dentry) == 0 && !(dentry->d_flags & DCACHE_DISCONNECTED))
- __d_drop(dentry);
spin_unlock(&dentry->d_lock);
}
RETURN(inode);
}
-static void ll_invalidate_negative_children(struct inode *dir)
+/* mark negative sub file dentries invalid and prune unused dentries */
+static void ll_prune_negative_children(struct inode *dir)
{
- struct dentry *dentry, *tmp_subdir;
+ struct dentry *dentry;
+ struct dentry *child;
+ ENTRY;
+
+restart:
spin_lock(&dir->i_lock);
hlist_for_each_entry(dentry, &dir->i_dentry, d_alias) {
spin_lock(&dentry->d_lock);
- if (!list_empty(&dentry->d_subdirs)) {
- struct dentry *child;
-
- list_for_each_entry_safe(child, tmp_subdir,
- &dentry->d_subdirs,
- d_child) {
- if (child->d_inode == NULL)
- d_lustre_invalidate(child, 1);
+ list_for_each_entry(child, &dentry->d_subdirs, d_child) {
+ if (child->d_inode)
+ continue;
+
+ spin_lock_nested(&child->d_lock, DENTRY_D_LOCK_NESTED);
+ __d_lustre_invalidate(child);
+ if (!ll_d_count(child)) {
+ dget_dlock(child);
+ __d_drop(child);
+ spin_unlock(&child->d_lock);
+ spin_unlock(&dentry->d_lock);
+ spin_unlock(&dir->i_lock);
+
+ CDEBUG(D_DENTRY, "prune negative dentry %pd\n",
+ child);
+
+ dput(child);
+ goto restart;
}
+ spin_unlock(&child->d_lock);
}
spin_unlock(&dentry->d_lock);
}
spin_unlock(&dir->i_lock);
+
+ EXIT;
}
int ll_test_inode_by_fid(struct inode *inode, void *opaque)
ll_test_inode_by_fid,
(void *)&lli->lli_pfid);
if (master_inode) {
- ll_invalidate_negative_children(master_inode);
+ ll_prune_negative_children(master_inode);
iput(master_inode);
}
} else {
- ll_invalidate_negative_children(inode);
+ ll_prune_negative_children(inode);
}
}
if ((bits & (MDS_INODELOCK_LOOKUP | MDS_INODELOCK_PERM)) &&
inode->i_sb->s_root != NULL &&
inode != inode->i_sb->s_root->d_inode)
- ll_invalidate_aliases(inode);
+ ll_prune_aliases(inode);
if (bits & (MDS_INODELOCK_LOOKUP | MDS_INODELOCK_PERM))
forget_all_cached_acls(inode);