From: "J. Bruce Fields" <bfields@xxxxxxxxxx> Replace another unhelpful acronym. Signed-off-by: J. Bruce Fields <bfields@xxxxxxxxxx> --- fs/exportfs/expfs.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fs/exportfs/expfs.c b/fs/exportfs/expfs.c index d32ead9..b33b9c4 100644 --- a/fs/exportfs/expfs.c +++ b/fs/exportfs/expfs.c @@ -228,14 +228,14 @@ reconnect_path(struct vfsmount *mnt, struct dentry *target_dir, char *nbuf) int err = -ESTALE; while (target_dir->d_flags & DCACHE_DISCONNECTED) { - struct dentry *pd = find_disconnected_root(target_dir); + struct dentry *dentry = find_disconnected_root(target_dir); - BUG_ON(pd == mnt->mnt_sb->s_root); + BUG_ON(dentry == mnt->mnt_sb->s_root); - if (!IS_ROOT(pd)) { + if (!IS_ROOT(dentry)) { /* must have found a connected parent - great */ clear_disconnected(target_dir); - dput(pd); + dput(dentry); break; } else { struct dentry *parent; @@ -243,7 +243,7 @@ reconnect_path(struct vfsmount *mnt, struct dentry *target_dir, char *nbuf) * We have hit the top of a disconnected path, try to * find parent and connect. */ - parent = reconnect_one(mnt, pd, nbuf); + parent = reconnect_one(mnt, dentry, nbuf); if (!parent) goto out_reconnected; if (IS_ERR(parent)) { @@ -252,7 +252,7 @@ reconnect_path(struct vfsmount *mnt, struct dentry *target_dir, char *nbuf) } dput(parent); } - dput(pd); + dput(dentry); } if (target_dir->d_flags & DCACHE_DISCONNECTED) { -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html