ovl: prepare to copy up without workdir

With index=on, we copy up lower hardlinks to work dir and move them into
index dir. Fix locking to allow work dir and index dir to be the same
directory.

Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>

diff --git a/fs/overlayfs/copy_up.c b/fs/overlayfs/copy_up.c
index 9709cf2..6600453 100644 (file)
--- a/fs/overlayfs/copy_up.c
+++ b/fs/overlayfs/copy_up.c
@@ -584,9 +584,10 @@ static int ovl_copy_up_workdir(struct ovl_copy_up_ctx *c)
                .link = c->link
        };
 
-       err = ovl_lock_rename_workdir(c->workdir, c->destdir);
-       if (err)
-               return err;
+       /* workdir and destdir could be the same when copying up to indexdir */
+       err = -EIO;
+       if (lock_rename(c->workdir, c->destdir) != NULL)
+               goto unlock;
 
        err = ovl_prep_cu_creds(c->dentry, &cc);
        if (err)