* Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2011, 2015, Intel Corporation.
+ * Copyright (c) 2011, 2017, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
#define DEBUG_SUBSYSTEM S_LLITE
#include <obd_support.h>
-#include <lustre/lustre_idl.h>
#include <lustre_dlm.h>
#include "llite_internal.h"
if (lld == NULL) /* NFS copies the de->d_op methods (bug 4655) */
RETURN_EXIT;
- if (lld->lld_it) {
- ll_intent_release(lld->lld_it);
- OBD_FREE(lld->lld_it, sizeof(*lld->lld_it));
- }
-
de->d_fsdata = NULL;
call_rcu(&lld->lld_rcu_head, free_dentry_data);
* This avoids a race where ll_lookup_it() instantiates a dentry, but we get
* 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
-static 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)
-#elif defined(HAVE_D_COMPARE_5ARGS)
+ * lock_match() fails) and we spin around real_lookup().
+ *
+ * This race doesn't apply to lookups in d_alloc_parallel(), and for
+ * those we want to ensure that only one dentry with a given name is
+ * in ll_lookup_nd() at a time. So allow invalid dentries to match
+ * while d_in_lookup(). We will be called again when the lookup
+ * completes, and can give a different answer then.
+ */
+#if defined(HAVE_D_COMPARE_5ARGS)
static int ll_dcompare(const struct dentry *parent, const struct dentry *dentry,
unsigned int len, const char *str,
const struct qstr *name)
-#else
-static int ll_dcompare(struct dentry *parent, struct qstr *d_name,
- struct qstr *name)
+#elif defined(HAVE_D_COMPARE_4ARGS)
+static int ll_dcompare(const struct dentry *dentry, unsigned int len,
+ const char *str, const struct qstr *name)
#endif
{
-#if !defined(HAVE_D_COMPARE_7ARGS) && !defined(HAVE_D_COMPARE_5ARGS)
- /* XXX: (ugh !) d_name must be in-dentry structure */
- struct dentry *dentry = container_of(d_name, struct dentry, d_name);
- unsigned int len = d_name->len;
- const char *str = d_name->name;
-#endif
ENTRY;
if (len != name->len)
if (d_mountpoint((struct dentry *)dentry))
RETURN(0);
+ /* ensure exclusion against parallel lookup of the same name */
+ if (d_in_lookup((struct dentry *)dentry))
+ return 0;
+
if (d_lustre_invalid(dentry))
RETURN(1);
* - return 0 to cache the dentry
* Should NOT be called with the dcache lock, see fs/dcache.c
*/
-static int ll_ddelete(HAVE_D_DELETE_CONST struct dentry *de)
+static int ll_ddelete(const struct dentry *de)
{
ENTRY;
LASSERT(de);
- CDEBUG(D_DENTRY, "%s dentry %.*s (%p, parent %p, inode %p) %s%s\n",
+ CDEBUG(D_DENTRY, "%s dentry %pd (%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,
+ de, de, de->d_parent, de->d_inode,
d_unhashed((struct dentry *)de) ? "" : "hashed,",
list_empty(&de->d_subdirs) ? "" : "subdirs");
-#ifdef HAVE_DCACHE_LOCK
- LASSERT(ll_d_count(de) == 0);
-#else
/* kernel >= 2.6.38 last refcount is decreased after this function. */
LASSERT(ll_d_count(de) == 1);
-#endif
if (d_lustre_invalid((struct dentry *)de))
RETURN(1);
ENTRY;
LASSERT(de != NULL);
- 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,
- ll_d_count(de));
+ CDEBUG(D_DENTRY, "ldd on dentry %pd (%p) parent %p inode %p refc %d\n",
+ de, de, de->d_parent, de->d_inode,
+ ll_d_count(de));
if (de->d_fsdata == NULL) {
struct ll_dentry_data *lld;
if (likely(de->d_fsdata == NULL)) {
de->d_fsdata = lld;
__d_lustre_invalidate(de);
-#ifdef HAVE_DCACHE_LOCK
- /* kernel >= 2.6.38 d_op is set in d_alloc() */
- de->d_op = &ll_d_ops;
-#endif
} else {
OBD_FREE_PTR(lld);
}
if (it->it_remote_lock_mode != 0) {
handle.cookie = it->it_remote_lock_handle;
- CDEBUG(D_DLMTRACE, "releasing remote lock with cookie"
- "%#llx from it %p\n", handle.cookie, it);
+ CDEBUG(D_DLMTRACE,
+ "releasing remote lock with cookie %#llx from it %p\n",
+ handle.cookie, it);
ldlm_lock_decref(&handle,
it->it_remote_lock_mode);
it->it_remote_lock_mode = 0;
void ll_invalidate_aliases(struct inode *inode)
{
struct dentry *dentry;
- DECLARE_LL_D_HLIST_NODE_PTR(p);
ENTRY;
LASSERT(inode != NULL);
CDEBUG(D_INODE, "marking dentries for inode "DFID"(%p) invalid\n",
PFID(ll_inode2fid(inode)), inode);
- ll_lock_dcache(inode);
- ll_d_hlist_for_each_entry(dentry, p, &inode->i_dentry) {
- 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,
+ 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);
- if (unlikely(dentry == dentry->d_sb->s_root)) {
- CERROR("%s: called on root dentry=%p, fid="DFID"\n",
- ll_get_fsname(dentry->d_sb, NULL, 0),
- dentry, PFID(ll_inode2fid(inode)));
- lustre_dump_dentry(dentry, 1);
- libcfs_debug_dumpstack(NULL);
- }
-
d_lustre_invalidate(dentry, 0);
}
- ll_unlock_dcache(inode);
+ spin_unlock(&inode->i_lock);
EXIT;
}
{
struct inode *dir = dentry->d_parent->d_inode;
+ CDEBUG(D_VFSTRACE, "VFS Op:name=%s, flags=%u\n",
+ dentry->d_name.name, lookup_flags);
+
/* If this is intermediate component path lookup and we were able to get
* to this dentry, then its lock has not been revoked and the
* path component is valid. */
if (lookup_flags & LOOKUP_REVAL)
return 0;
- if (!dentry_may_statahead(dir, dentry))
- return 1;
-
-#ifndef HAVE_DCACHE_LOCK
if (lookup_flags & LOOKUP_RCU)
return -ECHILD;
-#endif
- ll_statahead(dir, &dentry, dentry->d_inode == NULL);
- return 1;
-}
+ if (dentry_may_statahead(dir, dentry))
+ ll_revalidate_statahead(dir, &dentry, dentry->d_inode == NULL);
-/*
- * Always trust cached dentries. Update statahead window if necessary.
- */
-#ifdef HAVE_IOP_ATOMIC_OPEN
-static int ll_revalidate_nd(struct dentry *dentry, unsigned int flags)
-{
- int rc;
- ENTRY;
-
- CDEBUG(D_VFSTRACE, "VFS Op:name=%s, flags=%u\n",
- dentry->d_name.name, flags);
-
- rc = ll_revalidate_dentry(dentry, flags);
- RETURN(rc);
-}
-#else
-static int ll_revalidate_nd(struct dentry *dentry, struct nameidata *nd)
-{
- int rc;
- ENTRY;
-
- /*
- * this is normally called from NFS export, and we don't know whether
- * this is the last component.
- */
- if (nd == NULL)
- RETURN(1);
-
- CDEBUG(D_VFSTRACE, "VFS Op:name=%s, flags=%u\n",
- dentry->d_name.name, nd->flags);
-
- rc = ll_revalidate_dentry(dentry, nd->flags);
- RETURN(rc);
+ return 1;
}
-#endif
const struct dentry_operations ll_d_ops = {
- .d_revalidate = ll_revalidate_nd,
+ .d_revalidate = ll_revalidate_dentry,
.d_release = ll_release,
.d_delete = ll_ddelete,
.d_compare = ll_dcompare,