|
@@ -322,17 +322,17 @@ static void dentry_free(struct dentry *dentry)
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * dentry_rcuwalk_barrier - invalidate in-progress rcu-walk lookups
|
|
|
+ * dentry_rcuwalk_invalidate - invalidate in-progress rcu-walk lookups
|
|
|
* @dentry: the target dentry
|
|
|
* After this call, in-progress rcu-walk path lookup will fail. This
|
|
|
* should be called after unhashing, and after changing d_inode (if
|
|
|
* the dentry has not already been unhashed).
|
|
|
*/
|
|
|
-static inline void dentry_rcuwalk_barrier(struct dentry *dentry)
|
|
|
+static inline void dentry_rcuwalk_invalidate(struct dentry *dentry)
|
|
|
{
|
|
|
- assert_spin_locked(&dentry->d_lock);
|
|
|
- /* Go through a barrier */
|
|
|
- write_seqcount_barrier(&dentry->d_seq);
|
|
|
+ lockdep_assert_held(&dentry->d_lock);
|
|
|
+ /* Go through am invalidation barrier */
|
|
|
+ write_seqcount_invalidate(&dentry->d_seq);
|
|
|
}
|
|
|
|
|
|
/*
|
|
@@ -372,7 +372,7 @@ static void dentry_unlink_inode(struct dentry * dentry)
|
|
|
struct inode *inode = dentry->d_inode;
|
|
|
__d_clear_type_and_inode(dentry);
|
|
|
hlist_del_init(&dentry->d_u.d_alias);
|
|
|
- dentry_rcuwalk_barrier(dentry);
|
|
|
+ dentry_rcuwalk_invalidate(dentry);
|
|
|
spin_unlock(&dentry->d_lock);
|
|
|
spin_unlock(&inode->i_lock);
|
|
|
if (!inode->i_nlink)
|
|
@@ -494,7 +494,7 @@ void __d_drop(struct dentry *dentry)
|
|
|
__hlist_bl_del(&dentry->d_hash);
|
|
|
dentry->d_hash.pprev = NULL;
|
|
|
hlist_bl_unlock(b);
|
|
|
- dentry_rcuwalk_barrier(dentry);
|
|
|
+ dentry_rcuwalk_invalidate(dentry);
|
|
|
}
|
|
|
}
|
|
|
EXPORT_SYMBOL(__d_drop);
|
|
@@ -1752,7 +1752,7 @@ static void __d_instantiate(struct dentry *dentry, struct inode *inode)
|
|
|
if (inode)
|
|
|
hlist_add_head(&dentry->d_u.d_alias, &inode->i_dentry);
|
|
|
__d_set_inode_and_type(dentry, inode, add_flags);
|
|
|
- dentry_rcuwalk_barrier(dentry);
|
|
|
+ dentry_rcuwalk_invalidate(dentry);
|
|
|
spin_unlock(&dentry->d_lock);
|
|
|
fsnotify_d_instantiate(dentry, inode);
|
|
|
}
|