History

ovl: don't set origin on broken lower hardlink

When copying up a file that has multiple hard links we need to break any association with the origin file. This makes copy-up be essentially an atomic replace. The new file has nothing to do with the old one (except having the same data and metadata initially), so don't set the overlay.origin attribute. We can relax this in the future when we are able to index upper object by origin.

Miklos Szeredi committed 9 years ago

Commit fbaf94e1 parent e85f82f1 file · +8 −3Browse files

Unified · Split

fs/overlayfs/copy_up.c+8−3
@@ -392,10 +392,15 @@ static int ovl_copy_up_locked(struct dentry *workdir, struct dentry *upperdir, · 391 unmodified lines
392392 /*
393393 * Store identifier of lower inode in upper inode xattr to
394394 * allow lookup of the copy up origin inode.
395+ *
396+ * Don't set origin when we are breaking the association with a lower
397+ * hard link.
395398 */
396− err = ovl_set_origin(dentry, lowerpath->dentry, temp);
397− if (err)
398− goto out_cleanup;
399+ if (S_ISDIR(stat->mode) || stat->nlink == 1) {
400+ err = ovl_set_origin(dentry, lowerpath->dentry, temp);
401+ if (err)
402+ goto out_cleanup;
403+ }
399404
400405 upper = lookup_one_len(dentry->d_name.name, upperdir,
401406 dentry->d_name.len);