From: Chandan Rajendra <chandan@xxxxxxxxxxxxxxxxxx>
For a pure upper/lower dir in a non-samefs setup, stat(2) returns the
overlay inode number as the value of st_ino. To keep in line with this
behaviour, ovl_fill_real() has been modified to return overlay inode
number of the "." entry as the d_ino of a pure upper dir.
[amir: change the subject line]
Signed-off-by: Chandan Rajendra <chandan@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Amir Goldstein <amir73il@xxxxxxxxx>
---
fs/overlayfs/readdir.c | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/fs/overlayfs/readdir.c b/fs/overlayfs/readdir.c
index 4f2479b6ef91..74b859ed569e 100644
--- a/fs/overlayfs/readdir.c
+++ b/fs/overlayfs/readdir.c
@@ -451,7 +451,6 @@ static struct ovl_dir_cache *ovl_cache_get(struct dentry *dentry)
* sure that d_ino will be consistent with st_ino from stat(2).
*/
static int ovl_cache_update_ino(struct path *path, struct ovl_cache_entry *p)
-
{
struct dentry *dir = path->dentry;
struct dentry *this = NULL;
@@ -459,9 +458,6 @@ static int ovl_cache_update_ino(struct path *path, struct ovl_cache_entry *p)
u64 ino = p->real_ino;
int err = 0;
- if (!ovl_same_sb(dir->d_sb))
- goto out;
-
if (p->name[0] == '.') {
if (p->len == 1) {
this = dget(dir);
@@ -493,8 +489,8 @@ static int ovl_cache_update_ino(struct path *path, struct ovl_cache_entry *p)
err = vfs_getattr(&statpath, &stat, STATX_INO, 0);
if (err)
goto fail;
-
- WARN_ON_ONCE(dir->d_sb->s_dev != stat.dev);
+ if (d_is_dir(this) || ovl_same_sb(this->d_sb))
+ WARN_ON_ONCE(dir->d_sb->s_dev != stat.dev);
ino = stat.ino;
}
@@ -616,6 +612,7 @@ struct ovl_readdir_translate {
struct ovl_dir_cache *cache;
struct dir_context ctx;
u64 parent_ino;
+ u64 current_ino;
};
static int ovl_fill_real(struct dir_context *ctx, const char *name,
@@ -628,6 +625,8 @@ static int ovl_fill_real(struct dir_context *ctx, const char *name,
if (rdt->parent_ino && strcmp(name, "..") == 0)
ino = rdt->parent_ino;
+ else if (rdt->current_ino && namelen == 1 && name[0] == '.')
+ ino = rdt->current_ino;
else if (rdt->cache) {
struct ovl_cache_entry *p;
@@ -668,6 +667,9 @@ static int ovl_iterate_real(struct file *file, struct dir_context *ctx)
return PTR_ERR(rdt.cache);
}
+ if (!ovl_same_sb(dir->d_sb))
+ rdt.current_ino = dir->d_inode->i_ino;
+
return iterate_dir(od->realfile, &rdt.ctx);
}
@@ -688,9 +690,9 @@ static int ovl_iterate(struct file *file, struct dir_context *ctx)
* dir is impure then need to adjust d_ino for copied up
* entries.
*/
- if (ovl_same_sb(dentry->d_sb) &&
- (ovl_test_flag(OVL_IMPURE, d_inode(dentry)) ||
- OVL_TYPE_MERGE(ovl_path_type(dentry->d_parent)))) {
+ if (ovl_test_flag(OVL_IMPURE, d_inode(dentry)) ||
+ OVL_TYPE_MERGE(ovl_path_type(dentry->d_parent)) ||
+ !ovl_same_sb(dentry->d_sb)) {
return ovl_iterate_real(file, ctx);
}
return iterate_dir(od->realfile, ctx);
--
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
