diff options
| author | Christoph Hellwig <hch@lst.de> | 2013-10-16 15:48:53 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-11-09 00:16:35 -0500 |
| commit | 854ff5caabb5974b7464b438aba0bc47f1b6cf34 (patch) | |
| tree | 68cb6bb9a1f80fcf749dda1e44df6a7de2a52ccf /fs/exportfs | |
| parent | 13a2c3be03973d61b6cb89ff870e758c86327bb7 (diff) | |
| download | op-kernel-dev-854ff5caabb5974b7464b438aba0bc47f1b6cf34.zip op-kernel-dev-854ff5caabb5974b7464b438aba0bc47f1b6cf34.tar.gz | |
exportfs: BUG_ON in crazy corner case
This would indicate a nasty bug in the dcache and has never triggered in
the past 10 years as far as I know.
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/exportfs')
| -rw-r--r-- | fs/exportfs/expfs.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/fs/exportfs/expfs.c b/fs/exportfs/expfs.c index c43fe9b..6d0a7fa 100644 --- a/fs/exportfs/expfs.c +++ b/fs/exportfs/expfs.c @@ -112,18 +112,14 @@ reconnect_path(struct vfsmount *mnt, struct dentry *target_dir, char *nbuf) while (target_dir->d_flags & DCACHE_DISCONNECTED && noprogress++ < 10) { struct dentry *pd = find_disconnected_root(target_dir); + BUG_ON(pd == mnt->mnt_sb->s_root); + if (!IS_ROOT(pd)) { /* must have found a connected parent - great */ spin_lock(&pd->d_lock); pd->d_flags &= ~DCACHE_DISCONNECTED; spin_unlock(&pd->d_lock); noprogress = 0; - } else if (pd == mnt->mnt_sb->s_root) { - printk(KERN_ERR "export: Eeek filesystem root is not connected, impossible\n"); - spin_lock(&pd->d_lock); - pd->d_flags &= ~DCACHE_DISCONNECTED; - spin_unlock(&pd->d_lock); - noprogress = 0; } else { /* * We have hit the top of a disconnected path, try to |
