@@ -52,7 +52,7 @@ the dcache that are not needed for normal filesystem access.
To implement these features, the dcache has:
-a/ A dentry flag DCACHE_DISCONNECTED which is set on
+a/ A dentry flag DCACHE_CONNECTING which is set on
any dentry that might not be part of the proper prefix.
This is set when anonymous dentries are created, and cleared when a
dentry is noticed to be a child of a dentry which is in the proper
@@ -69,7 +69,7 @@ c/ Helper routines to allocate anonymous dentries, and to help attach
d_obtain_alias(inode) will return a dentry for the given inode.
If the inode already has a dentry, one of those is returned.
If it doesn't, a new anonymous (IS_ROOT and
- DCACHE_DISCONNECTED) dentry is allocated and attached.
+ DCACHE_CONNECTING) dentry is allocated and attached.
In the case of a directory, care is taken that only one dentry
can ever be attached.
d_splice_alias(inode, dentry) or d_materialise_unique(dentry, inode)
@@ -368,7 +368,7 @@ static struct dentry *ll_find_alias(struct inode *inode, struct dentry *dentry)
LASSERT(alias != dentry);
spin_lock(&alias->d_lock);
- if (alias->d_flags & DCACHE_DISCONNECTED)
+ if (alias->d_flags & DCACHE_CONNECTING)
/* LASSERT(last_discon == NULL); LU-405, bz 20055 */
discon_alias = alias;
else if (alias->d_parent == dentry->d_parent &&
@@ -395,7 +395,7 @@ static struct dentry *ll_find_alias(struct inode *inode, struct dentry *dentry)
/*
* Similar to d_splice_alias(), but lustre treats invalid alias
- * similar to DCACHE_DISCONNECTED, and tries to use it anyway.
+ * similar to DCACHE_CONNECTING, and tries to use it anyway.
*/
struct dentry *ll_splice_alias(struct inode *inode, struct dentry *de)
{
@@ -726,7 +726,7 @@ EXPORT_SYMBOL(dget_parent);
* it can be unhashed only if it has no children, or if it is the root
* of a filesystem.
*
- * If the inode has an IS_ROOT, DCACHE_DISCONNECTED alias, then prefer
+ * If the inode has an IS_ROOT, DCACHE_CONNECTING alias, then prefer
* any other hashed alias over that one.
*/
static struct dentry *__d_find_alias(struct inode *inode)
@@ -739,7 +739,7 @@ again:
spin_lock(&alias->d_lock);
if (S_ISDIR(inode->i_mode) || !d_unhashed(alias)) {
if (IS_ROOT(alias) &&
- (alias->d_flags & DCACHE_DISCONNECTED)) {
+ (alias->d_flags & DCACHE_CONNECTING)) {
discon_alias = alias;
} else {
__dget_dlock(alias);
@@ -1860,7 +1860,7 @@ struct dentry *__d_obtain_alias(struct inode *inode, int disconnected)
add_flags = d_flags_for_inode(inode);
if (disconnected)
- add_flags |= DCACHE_DISCONNECTED;
+ add_flags |= DCACHE_CONNECTING;
spin_lock(&tmp->d_lock);
tmp->d_inode = inode;
@@ -1883,7 +1883,7 @@ struct dentry *__d_obtain_alias(struct inode *inode, int disconnected)
}
/**
- * d_obtain_alias - find or allocate a DISCONNECTED dentry for a given inode
+ * d_obtain_alias - find or allocate a CONNECTING dentry for a given inode
* @inode: inode to allocate the dentry for
*
* Obtain a dentry for an inode resulting from NFS filehandle conversion or
@@ -72,7 +72,7 @@ find_acceptable_alias(struct dentry *result,
static bool dentry_connected(struct dentry *dentry)
{
dget(dentry);
- while (dentry->d_flags & DCACHE_DISCONNECTED) {
+ while (dentry->d_flags & DCACHE_CONNECTING) {
struct dentry *parent = dget_parent(dentry);
dput(dentry);
@@ -89,13 +89,13 @@ static bool dentry_connected(struct dentry *dentry)
static void clear_disconnected(struct dentry *dentry)
{
dget(dentry);
- while (dentry->d_flags & DCACHE_DISCONNECTED) {
+ while (dentry->d_flags & DCACHE_CONNECTING) {
struct dentry *parent = dget_parent(dentry);
WARN_ON_ONCE(IS_ROOT(dentry));
spin_lock(&dentry->d_lock);
- dentry->d_flags &= ~DCACHE_DISCONNECTED;
+ dentry->d_flags &= ~DCACHE_CONNECTING;
spin_unlock(&dentry->d_lock);
dput(dentry);
@@ -187,12 +187,12 @@ out_reconnected:
/*
* Make sure target_dir is fully connected to the dentry tree.
*
- * On successful return, DCACHE_DISCONNECTED will be cleared on
+ * On successful return, DCACHE_CONNECTING will be cleared on
* target_dir, and target_dir->d_parent->...->d_parent will reach the
* root of the filesystem.
*
- * Whenever DCACHE_DISCONNECTED is unset, target_dir is fully connected.
- * But the converse is not true: target_dir may have DCACHE_DISCONNECTED
+ * Whenever DCACHE_CONNECTING is unset, target_dir is fully connected.
+ * But the converse is not true: target_dir may have DCACHE_CONNECTING
* set but already be connected. In that case we'll verify the
* connection to root and then clear the flag.
*
@@ -208,7 +208,7 @@ reconnect_path(struct vfsmount *mnt, struct dentry *target_dir, char *nbuf)
dentry = dget(target_dir);
- while (dentry->d_flags & DCACHE_DISCONNECTED) {
+ while (dentry->d_flags & DCACHE_CONNECTING) {
BUG_ON(dentry == mnt->mnt_sb->s_root);
if (IS_ROOT(dentry))
@@ -437,7 +437,7 @@ struct dentry *exportfs_decode_fh(struct vfsmount *mnt, struct fid *fid,
* to ensure our dentry is connected all the way up to the
* filesystem root.
*/
- if (result->d_flags & DCACHE_DISCONNECTED) {
+ if (result->d_flags & DCACHE_CONNECTING) {
err = reconnect_path(mnt, result, nbuf);
if (err)
goto err_result;
@@ -705,7 +705,7 @@ static int vfat_find(struct inode *dir, struct qstr *qname,
*/
static int vfat_d_anon_disconn(struct dentry *dentry)
{
- return IS_ROOT(dentry) && (dentry->d_flags & DCACHE_DISCONNECTED);
+ return IS_ROOT(dentry) && (dentry->d_flags & DCACHE_CONNECTING);
}
static struct dentry *vfat_lookup(struct inode *dir, struct dentry *dentry,
@@ -738,7 +738,7 @@ static struct dentry *vfat_lookup(struct inode *dir, struct dentry *dentry,
alias = d_find_alias(inode);
if (alias && !vfat_d_anon_disconn(alias)) {
/*
- * This inode has non anonymous-DCACHE_DISCONNECTED
+ * This inode has non anonymous-DCACHE_CONNECTING
* dentry. This means, the user did ->lookup() by an
* another name (longname vs 8.3 alias of it) in past.
*
@@ -252,8 +252,8 @@ static __be32 nfsd_set_fh_dentry(struct svc_rqst *rqstp, struct svc_fh *fhp)
}
if (S_ISDIR(dentry->d_inode->i_mode) &&
- (dentry->d_flags & DCACHE_DISCONNECTED)) {
- printk("nfsd: find_fh_dentry returned a DISCONNECTED directory: %pd2\n",
+ (dentry->d_flags & DCACHE_CONNECTING)) {
+ printk("nfsd: find_fh_dentry returned a CONNECTING directory: %pd2\n",
dentry);
}
@@ -455,7 +455,7 @@ static void ocfs2_dentry_iput(struct dentry *dentry, struct inode *inode)
* No dentry lock is ok if we're disconnected or
* unhashed.
*/
- if (!(dentry->d_flags & DCACHE_DISCONNECTED) &&
+ if (!(dentry->d_flags & DCACHE_CONNECTING) &&
!d_unhashed(dentry)) {
unsigned long long ino = 0ULL;
if (inode)
@@ -149,7 +149,7 @@ bail_add:
if (inode) {
/*
- * If d_splice_alias() finds a DCACHE_DISCONNECTED
+ * If d_splice_alias() finds a DCACHE_CONNECTING
* dentry, it will d_move() it on top of ourse. The
* return value will indicate this however, so in
* those cases, we switch them around for the locking
@@ -177,14 +177,14 @@ struct dentry_operations {
#define DCACHE_OP_DELETE 0x00000008
#define DCACHE_OP_PRUNE 0x00000010
-#define DCACHE_DISCONNECTED 0x00000020
+#define DCACHE_CONNECTING 0x00000020
/* This dentry is possibly not currently connected to the dcache tree, in
* which case its parent will either be itself, or will have this flag as
* well. nfsd will not use a dentry with this bit set, but will first
* endeavour to clear the bit either by discovering that it is connected,
* or by performing lookup operations. Any filesystem which supports
* nfsd_operations MUST have a lookup function which, if it finds a
- * directory inode with a DCACHE_DISCONNECTED dentry, will d_move that
+ * directory inode with a DCACHE_CONNECTING dentry, will d_move that
* dentry into place and return that dentry rather than the passed one,
* typically using d_splice_alias. */