diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2013-10-16 21:20:19 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-11-09 00:16:37 -0500 |
| commit | e4b70ebeeba954cb9cbcf0f19016bb9c2b8711c1 (patch) | |
| tree | cb2f04bd4e8b23fcd5d94235f310c95b472253ac /fs | |
| parent | a056cc8934c7bd046dc44af559bba163115fde40 (diff) | |
| download | linux-stable-e4b70ebeeba954cb9cbcf0f19016bb9c2b8711c1.tar.gz linux-stable-e4b70ebeeba954cb9cbcf0f19016bb9c2b8711c1.tar.bz2 linux-stable-e4b70ebeeba954cb9cbcf0f19016bb9c2b8711c1.zip | |
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: Christoph Hellwig <hch@lst.de>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/exportfs/expfs.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/fs/exportfs/expfs.c b/fs/exportfs/expfs.c index 6b5ddd5492bc..d8ba88ac10e5 100644 --- a/fs/exportfs/expfs.c +++ b/fs/exportfs/expfs.c @@ -145,18 +145,9 @@ static void clear_disconnected(struct dentry *dentry) static int reconnect_path(struct vfsmount *mnt, struct dentry *target_dir, char *nbuf) { - int noprogress = 0; int err = -ESTALE; - /* - * 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) { + while (target_dir->d_flags & DCACHE_DISCONNECTED) { struct dentry *pd = find_disconnected_root(target_dir); BUG_ON(pd == mnt->mnt_sb->s_root); @@ -230,9 +221,7 @@ reconnect_path(struct vfsmount *mnt, struct dentry *target_dir, char *nbuf) */ dput(npd); dput(ppd); - if (npd == pd) - noprogress = 0; - else + if (npd != pd) goto out_reconnected; if (IS_ROOT(pd)) { /* something went wrong, we have to give up */ |