Commit e4b70ebe authored by J. Bruce Fields's avatar J. Bruce Fields Committed by Al Viro

exportfs: eliminate unused "noprogress" counter

Note this counter is now being set to 0 on every pass through the loop,
so it no longer serves any useful purpose.
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent a056cc89
...@@ -145,18 +145,9 @@ static void clear_disconnected(struct dentry *dentry) ...@@ -145,18 +145,9 @@ static void clear_disconnected(struct dentry *dentry)
static int static int
reconnect_path(struct vfsmount *mnt, struct dentry *target_dir, char *nbuf) reconnect_path(struct vfsmount *mnt, struct dentry *target_dir, char *nbuf)
{ {
int noprogress = 0;
int err = -ESTALE; int err = -ESTALE;
/* while (target_dir->d_flags & DCACHE_DISCONNECTED) {
* It is possible that a confused file system might not let us complete
* the path to the root. For example, if get_parent returns a directory
* in which we cannot find a name for the child. While this implies a
* very sick filesystem we don't want it to cause knfsd to spin. Hence
* the noprogress counter. If we go through the loop 10 times (2 is
* probably enough) without getting anywhere, we just give up
*/
while (target_dir->d_flags & DCACHE_DISCONNECTED && noprogress++ < 10) {
struct dentry *pd = find_disconnected_root(target_dir); struct dentry *pd = find_disconnected_root(target_dir);
BUG_ON(pd == mnt->mnt_sb->s_root); BUG_ON(pd == mnt->mnt_sb->s_root);
...@@ -230,9 +221,7 @@ reconnect_path(struct vfsmount *mnt, struct dentry *target_dir, char *nbuf) ...@@ -230,9 +221,7 @@ reconnect_path(struct vfsmount *mnt, struct dentry *target_dir, char *nbuf)
*/ */
dput(npd); dput(npd);
dput(ppd); dput(ppd);
if (npd == pd) if (npd != pd)
noprogress = 0;
else
goto out_reconnected; goto out_reconnected;
if (IS_ROOT(pd)) { if (IS_ROOT(pd)) {
/* something went wrong, we have to give up */ /* something went wrong, we have to give up */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment