With inodes index feature, all lower and upper hardlinks point to
the same overlay inode. However, when a lower hardlink is accessed
for read operation, the real inode operated on is not the same inode
as the real inode for read operation on an upper hardlink.
When lookup finds a lower hardlink, which is already indexed by
an earlier upper hardlink copy up, call ovl_copy_up() to link the
indexed upper on top of the lower hardlink and then operate on the
upper real inode to avoid this inconsistency.
Invalidate a lower indexed dentry on dcache lookup, so ovl_lookup()
is called to perform the index link up.
The following test demonstrates the upper/lower hardlinks inconsistency:
$ echo -n a > /lower/foo
$ ln /lower/foo /lower/bar
$ cd /mnt
$ echo -n b >> foo
$ tail foo bar # foo is indexed upper, bar is indexed lower
==> foo <==
ab
==> bar <==
a
$ echo -n c >> bar
$ tail foo bar # both aliases are indexed upper
==> foo <==
abc
==> bar <==
abc
Signed-off-by: Amir Goldstein <amir73il@xxxxxxxxx>
---
fs/overlayfs/namei.c | 20 ++++++++++++++++++--
fs/overlayfs/super.c | 39 +++++++++++++++++++++++++++++++++------
2 files changed, 51 insertions(+), 8 deletions(-)
diff --git a/fs/overlayfs/namei.c b/fs/overlayfs/namei.c
index 08154dad725e..c6b986b68105 100644
--- a/fs/overlayfs/namei.c
+++ b/fs/overlayfs/namei.c
@@ -659,7 +659,14 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,
goto out_put;
if (!upperdentry) {
- /* TODO: handle lookup of lower indexed entries */
+ /*
+ * At this point, if we find a positive index, we cannot
+ * tell if the index entry has been created by a copy up
+ * in progress, because we don't have the overlay inode
+ * and we don't hold the overlay inode oi_lock. So we
+ * will treat this entry as non-indexed lower and will
+ * try to link it up before returning from lookup.
+ */
} else if (index && d_inode(index)) {
/* Vertified indexed upper */
type |= __OVL_PATH_INDEX;
@@ -722,13 +729,22 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,
oe->redirect = upperredirect;
oe->__upperdentry = upperdentry;
memcpy(oe->lowerstack, stack, sizeof(struct path) * ctr);
- dput(index);
kfree(stack);
kfree(d.redirect);
dentry->d_fsdata = oe;
ovl_update_type(dentry, d.is_dir);
d_add(dentry, inode);
+ /* Link up indexed lower early for consistent overlay hardlinks */
+ if (index && d_inode(index) && !upperdentry) {
+ err = ovl_copy_up(dentry);
+ if (err) {
+ pr_warn_ratelimited("overlayfs: failed link up to index (%pd2, index=%pd2, err=%i)\n",
+ dentry, index, err);
+ }
+ }
+ dput(index);
+
return NULL;
out_free_oe:
diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
index 144354b5fcf1..d6604bbe0a66 100644
--- a/fs/overlayfs/super.c
+++ b/fs/overlayfs/super.c
@@ -117,11 +117,43 @@ static struct dentry *ovl_d_real(struct dentry *dentry,
return dentry;
}
+static int ovl_dentry_indexed_revalidate(struct dentry *dentry,
+ unsigned int flags)
+{
+ enum ovl_path_type type = ovl_path_type(dentry);
+ bool is_upper;
+
+ if (!ovl_indexdir(dentry->d_sb) ||
+ d_is_dir(dentry) || d_is_negative(dentry))
+ return 1;
+
+ /*
+ * Invalidate lower hardlink after it has been indexed by copy up
+ * of another lower alias. ovl_lookup will trigger copy up of this
+ * path and link the upper path to the upper index inode.
+ */
+ ovl_inode_real(d_inode(dentry), &is_upper);
+ if (is_upper && !OVL_TYPE_UPPER(type))
+ return 0;
+
+ return 1;
+}
+
+static const struct dentry_operations ovl_dentry_operations = {
+ .d_release = ovl_dentry_release,
+ .d_real = ovl_d_real,
+ .d_revalidate = ovl_dentry_indexed_revalidate,
+};
+
static int ovl_dentry_revalidate(struct dentry *dentry, unsigned int flags)
{
struct ovl_entry *oe = dentry->d_fsdata;
unsigned int i;
- int ret = 1;
+ int ret;
+
+ ret = ovl_dentry_indexed_revalidate(dentry, flags);
+ if (ret < 1)
+ return ret;
for (i = 0; i < oe->numlower; i++) {
struct dentry *d = oe->lowerstack[i].dentry;
@@ -158,11 +190,6 @@ static int ovl_dentry_weak_revalidate(struct dentry *dentry, unsigned int flags)
return ret;
}
-static const struct dentry_operations ovl_dentry_operations = {
- .d_release = ovl_dentry_release,
- .d_real = ovl_d_real,
-};
-
static const struct dentry_operations ovl_reval_dentry_operations = {
.d_release = ovl_dentry_release,
.d_real = ovl_d_real,
--
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
