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.

Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Fixes: 3a1e819b4e80 ("ovl: store file handle of lower inode on copy up")

diff --git a/fs/overlayfs/copy_up.c b/fs/overlayfs/copy_up.c
index ded8bfeb193ebde911676444174a6ea35a0540c7..a2a65120c9d04dbc0d4c5dd0de5baa1c133b8ad5 100644 (file)
--- a/fs/overlayfs/copy_up.c
+++ b/fs/overlayfs/copy_up.c
@@ -392,10 +392,15 @@ static int ovl_copy_up_locked(struct dentry *workdir, struct dentry *upperdir,
        /*
         * Store identifier of lower inode in upper inode xattr to
         * allow lookup of the copy up origin inode.
        /*
         * Store identifier of lower inode in upper inode xattr to
         * allow lookup of the copy up origin inode.

+        *
+        * Don't set origin when we are breaking the association with a lower
+        * hard link.

         */
         */

-       err = ovl_set_origin(dentry, lowerpath->dentry, temp);
-       if (err)
-               goto out_cleanup;
+       if (S_ISDIR(stat->mode) || stat->nlink == 1) {
+               err = ovl_set_origin(dentry, lowerpath->dentry, temp);
+               if (err)
+                       goto out_cleanup;
+       }

 
        upper = lookup_one_len(dentry->d_name.name, upperdir,
                               dentry->d_name.len);
 
        upper = lookup_one_len(dentry->d_name.name, upperdir,
                               dentry->d_name.len);