A re-factoring patch in NFS export series has passed the wrong argument
to ovl_get_inode() causing a regression in the very recent fix to
fsnotify of overlay merge dir.
The regression has caused merge directory inodes to be hashed by upper
instead of lower real inode, when NFS export and directory indexing is
disabled. That caused an inotify watch to become obsolete after directory
copy up and drop caches.
I modified new LTP test inotify07 to catch this regression.
The regression also caused multiple redirect dirs to same origin not to
be detected on lookup with NFS export disabled. An xfstest was added to
cover this case.
Fixes: 0aceb53e73be ("ovl: do not pass overlay dentry to ovl_get_inode()")
Signed-off-by: Amir Goldstein <amir73il@xxxxxxxxx>
---
Miklos,
Apparently, I've already managed to regress the fsnotify watch fix.
It was only regressed for nfs_export=off case, so I had missed it before.
With this fix in-place, I am going to re-post the xfstest for multiple
redirect to same origin, because it is now going to be detected on lookup
by the default overlayfs configuration (no index, no nfs export).
Thanks,
Amir.
fs/overlayfs/namei.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/overlayfs/namei.c b/fs/overlayfs/namei.c
index c5449efd96d5..d5a060ede8d1 100644
--- a/fs/overlayfs/namei.c
+++ b/fs/overlayfs/namei.c
@@ -976,8 +976,8 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,
upperdentry = dget(index);
if (upperdentry || ctr) {
- inode = ovl_get_inode(dentry->d_sb, upperdentry, origin, index,
- ctr);
+ inode = ovl_get_inode(dentry->d_sb, upperdentry,
+ stack[0].dentry, index, ctr);
err = PTR_ERR(inode);
if (IS_ERR(inode))
goto out_free_oe;
--
2.7.4
--
To unsubscribe from this list: send the line "unsubscribe linux-unionfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
