#include "llite_internal.h"
-cfs_spinlock_t ll_lookup_lock = CFS_SPIN_LOCK_UNLOCKED;
-
/* should NOT be called with the dcache lock, see fs/dcache.c */
static void ll_release(struct dentry *de)
{
* an AST before calling d_revalidate_it(). The dentry still exists (marked
* INVALID) so d_lookup() matches it, but we have no lock on it (so
* lock_match() fails) and we spin around real_lookup(). */
+#ifdef HAVE_D_COMPARE_7ARGS
+int ll_dcompare(const struct dentry *parent, const struct inode *pinode,
+ const struct dentry *dentry, const struct inode *inode,
+ unsigned int len, const char *str, const struct qstr *name)
+#else
int ll_dcompare(struct dentry *parent, struct qstr *d_name, struct qstr *name)
+#endif
{
- struct dentry *dchild;
- ENTRY;
+#ifdef HAVE_D_COMPARE_7ARGS
+ ENTRY;
- if (d_name->len != name->len)
- RETURN(1);
+ if (len != name->len)
+ RETURN(1);
- if (memcmp(d_name->name, name->name, name->len))
- RETURN(1);
+ if (memcmp(str, name->name, len))
+ RETURN(1);
+#else
+ struct dentry *dentry;
+ ENTRY;
- /* XXX: d_name must be in-dentry structure */
- dchild = container_of(d_name, struct dentry, d_name); /* ugh */
+ if (d_name->len != name->len)
+ RETURN(1);
- CDEBUG(D_DENTRY,"found name %.*s(%p) - flags %d/%x - refc %d\n",
- name->len, name->name, dchild,
- d_mountpoint(dchild), dchild->d_flags & DCACHE_LUSTRE_INVALID,
- atomic_read(&dchild->d_count));
+ if (memcmp(d_name->name, name->name, name->len))
+ RETURN(1);
- /* mountpoint is always valid */
- if (d_mountpoint(dchild))
- RETURN(0);
+ /* XXX: d_name must be in-dentry structure */
+ dentry = container_of(d_name, struct dentry, d_name); /* ugh */
+#endif
+
+ CDEBUG(D_DENTRY, "found name %.*s(%p) flags %#x refc %d\n",
+ name->len, name->name, dentry, dentry->d_flags,
+ d_refcount(dentry));
+
+ /* mountpoint is always valid */
+ if (d_mountpoint((struct dentry *)dentry))
+ RETURN(0);
- if (dchild->d_flags & DCACHE_LUSTRE_INVALID)
+ if (d_lustre_invalid(dentry))
RETURN(1);
RETURN(0);
* - return 0 to cache the dentry
* Should NOT be called with the dcache lock, see fs/dcache.c
*/
-static int ll_ddelete(struct dentry *de)
+static int ll_ddelete(HAVE_D_DELETE_CONST struct dentry *de)
{
- ENTRY;
- LASSERT(de);
-
- CDEBUG(D_DENTRY, "%s dentry %.*s (%p, parent %p, inode %p) %s%s\n",
- (de->d_flags & DCACHE_LUSTRE_INVALID ? "deleting" : "keeping"),
- de->d_name.len, de->d_name.name, de, de->d_parent, de->d_inode,
- d_unhashed(de) ? "" : "hashed,",
- list_empty(&de->d_subdirs) ? "" : "subdirs");
-
- /* if not ldlm lock for this inode, set i_nlink to 0 so that
- * this inode can be recycled later b=20433 */
- LASSERT(atomic_read(&de->d_count) == 0);
- if (de->d_inode && !find_cbdata(de->d_inode))
- de->d_inode->i_nlink = 0;
-
- if (de->d_flags & DCACHE_LUSTRE_INVALID)
+ ENTRY;
+ LASSERT(de);
+
+ CDEBUG(D_DENTRY, "%s dentry %.*s (%p, parent %p, inode %p) %s%s\n",
+ d_lustre_invalid((struct dentry *)de) ? "deleting" : "keeping",
+ de->d_name.len, de->d_name.name, de, de->d_parent, de->d_inode,
+ d_unhashed((struct dentry *)de) ? "" : "hashed,",
+ list_empty(&de->d_subdirs) ? "" : "subdirs");
+
+ /* kernel >= 2.6.38 last refcount is decreased after this function. */
+#ifdef DCACHE_OP_DELETE
+ LASSERT(d_refcount(de) == 1);
+#else
+ LASSERT(d_refcount(de) == 0);
+#endif
+
+ /* if not ldlm lock for this inode, set i_nlink to 0 so that
+ * this inode can be recycled later b=20433 */
+ if (de->d_inode && !find_cbdata(de->d_inode))
+ de->d_inode->i_nlink = 0;
+
+ if (d_lustre_invalid((struct dentry *)de))
RETURN(1);
RETURN(0);
CDEBUG(D_DENTRY, "ldd on dentry %.*s (%p) parent %p inode %p refc %d\n",
de->d_name.len, de->d_name.name, de, de->d_parent, de->d_inode,
- atomic_read(&de->d_count));
-
- if (de->d_fsdata == NULL) {
- struct ll_dentry_data *lld;
-
- OBD_ALLOC_PTR(lld);
- if (likely(lld != NULL)) {
- lock_dentry(de);
- if (likely(de->d_fsdata == NULL))
- de->d_fsdata = lld;
- else
- OBD_FREE_PTR(lld);
- unlock_dentry(de);
+ d_refcount(de));
+
+ if (de->d_fsdata == NULL) {
+ struct ll_dentry_data *lld;
+
+ OBD_ALLOC_PTR(lld);
+ if (likely(lld != NULL)) {
+ spin_lock(&de->d_lock);
+ if (likely(de->d_fsdata == NULL))
+ de->d_fsdata = lld;
+ else
+ OBD_FREE_PTR(lld);
+ spin_unlock(&de->d_lock);
} else {
RETURN(-ENOMEM);
}
if (lld != NULL && init_sa != 0)
lld->lld_sa_generation = 0;
- de->d_op = &ll_d_ops;
+#ifdef DCACHE_OP_HASH
+ LASSERT(de->d_op == &ll_d_ops);
+#else
+ de->d_op = &ll_d_ops;
+#endif
return rc;
}
EXIT;
}
-/* Drop dentry if it is not used already, unhash otherwise.
- Should be called with dcache lock held!
- Returns: 1 if dentry was dropped, 0 if unhashed. */
-int ll_drop_dentry(struct dentry *dentry)
-{
- lock_dentry(dentry);
- if (atomic_read(&dentry->d_count) == 0) {
- CDEBUG(D_DENTRY, "deleting dentry %.*s (%p) parent %p "
- "inode %p\n", dentry->d_name.len,
- dentry->d_name.name, dentry, dentry->d_parent,
- dentry->d_inode);
- dget_locked(dentry);
- __d_drop(dentry);
- unlock_dentry(dentry);
- spin_unlock(&dcache_lock);
- cfs_spin_unlock(&ll_lookup_lock);
- dput(dentry);
- cfs_spin_lock(&ll_lookup_lock);
- spin_lock(&dcache_lock);
- return 1;
- }
- /* disconected dentry can not be find without lookup, because we
- * not need his to unhash or mark invalid. */
- if (dentry->d_flags & DCACHE_DISCONNECTED) {
- unlock_dentry(dentry);
- RETURN (0);
- }
-
- if (!(dentry->d_flags & DCACHE_LUSTRE_INVALID)) {
- CDEBUG(D_DENTRY, "unhashing dentry %.*s (%p) parent %p "
- "inode %p refc %d\n", dentry->d_name.len,
- dentry->d_name.name, dentry, dentry->d_parent,
- dentry->d_inode, atomic_read(&dentry->d_count));
- /* actually we don't unhash the dentry, rather just
- * mark it inaccessible for to __d_lookup(). otherwise
- * sys_getcwd() could return -ENOENT -bzzz */
- dentry->d_flags |= DCACHE_LUSTRE_INVALID;
- if (!dentry->d_inode || !S_ISDIR(dentry->d_inode->i_mode))
- __d_drop(dentry);
- }
- unlock_dentry(dentry);
- return 0;
-}
-
-void ll_unhash_aliases(struct inode *inode)
+void ll_invalidate_aliases(struct inode *inode)
{
- struct list_head *tmp, *head;
- ENTRY;
-
- if (inode == NULL) {
- CERROR("unexpected NULL inode, tell phil\n");
- return;
- }
+ struct dentry *dentry;
+ ENTRY;
- CDEBUG(D_INODE, "marking dentries for ino %lu/%u(%p) invalid\n",
- inode->i_ino, inode->i_generation, inode);
+ LASSERT(inode != NULL);
- head = &inode->i_dentry;
- cfs_spin_lock(&ll_lookup_lock);
- spin_lock(&dcache_lock);
-restart:
- tmp = head;
- while ((tmp = tmp->next) != head) {
- struct dentry *dentry = list_entry(tmp, struct dentry, d_alias);
+ CDEBUG(D_INODE, "marking dentries for ino %lu/%u(%p) invalid\n",
+ inode->i_ino, inode->i_generation, inode);
+ ll_lock_dcache(inode);
+ cfs_list_for_each_entry(dentry, &inode->i_dentry, d_alias) {
CDEBUG(D_DENTRY, "dentry in drop %.*s (%p) parent %p "
"inode %p flags %d\n", dentry->d_name.len,
dentry->d_name.name, dentry, dentry->d_parent,
libcfs_debug_dumpstack(NULL);
}
- if (ll_drop_dentry(dentry))
- goto restart;
- }
- spin_unlock(&dcache_lock);
- cfs_spin_unlock(&ll_lookup_lock);
+ d_lustre_invalidate(dentry);
+ }
+ ll_unlock_dcache(inode);
EXIT;
}
if (it && (it->it_op & IT_CREAT))
RETURN(0);
- if (de->d_flags & DCACHE_LUSTRE_INVALID)
+ if (d_lustre_invalid(de))
RETURN(0);
ibits = MDS_INODELOCK_UPDATE;
ll_frob_intent(&it, &lookup_it);
LASSERT(it);
- if (it->it_op == IT_LOOKUP && !(de->d_flags & DCACHE_LUSTRE_INVALID))
+ if (it->it_op == IT_LOOKUP && !d_lustre_invalid(de))
RETURN(1);
if ((it->it_op == IT_OPEN) && de->d_inode) {
}
rc = 1;
- /* unfortunately ll_intent_lock may cause a callback and revoke our
- * dentry */
- ll_dentry_rehash(de, 0);
-
out:
/* We do not free request as it may be reused during following lookup
* (see comment in mdc/mdc_locks.c::mdc_intent_lock()), request will
if (req != NULL && !it_disposition(it, DISP_ENQ_COMPLETE))
ptlrpc_req_finished(req);
if (rc == 0) {
- ll_unhash_aliases(de->d_inode);
- /* done in ll_unhash_aliases()
- dentry->d_flags |= DCACHE_LUSTRE_INVALID; */
- } else {
- __u64 bits = 0;
-
- CDEBUG(D_DENTRY, "revalidated dentry %.*s (%p) parent %p "
- "inode %p refc %d\n", de->d_name.len,
- de->d_name.name, de, de->d_parent, de->d_inode,
- atomic_read(&de->d_count));
- ll_set_lock_data(exp, de->d_inode, it, &bits);
- ll_dentry_reset_flags(de, bits);
+ ll_invalidate_aliases(de->d_inode);
+ } else {
+ __u64 bits = 0;
+
+ CDEBUG(D_DENTRY, "revalidated dentry %.*s (%p) parent %p "
+ "inode %p refc %d\n", de->d_name.len,
+ de->d_name.name, de, de->d_parent, de->d_inode,
+ d_refcount(de));
+ ll_set_lock_data(exp, de->d_inode, it, &bits);
+ if ((bits & MDS_INODELOCK_LOOKUP) && d_lustre_invalid(de))
+ d_lustre_revalidate(de);
ll_lookup_finish_locks(it, de);
}
int rc;
ENTRY;
+#ifdef LOOKUP_RCU
+ if (nd->flags & LOOKUP_RCU)
+ return -ECHILD;
+#endif
+
if (nd && !(nd->flags & (LOOKUP_CONTINUE|LOOKUP_PARENT))) {
struct lookup_intent *it;