ovl: index dir act as work dir

With index=on, let index dir act as the work dir for copy up and cleanups.
This will help implementing whiteout inode sharing.

We still create the "work" dir on mount regardless of index=on and it is
used to test the features supported by upper fs.  One reason is that before
the feature tests, we do not know if index could be enabled or not.

The reason we do not use "index" directory also as workdir with index=off
is because the existence of the "index" directory acts as a simple
persistent signal that index was enabled on this filesystem and tools may
want to use that signal.

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

diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
index fbd6207..6e3fa96 100644 (file)
--- a/fs/overlayfs/super.c
+++ b/fs/overlayfs/super.c
@@ -1825,17 +1825,21 @@ static int ovl_fill_super(struct super_block *sb, void *data, int silent)
                sb->s_flags |= SB_RDONLY;
 
        if (!(ovl_force_readonly(ofs)) && ofs->config.index) {
+               /* index dir will act also as workdir */
+               dput(ofs->workdir);
+               ofs->workdir = NULL;
+               iput(ofs->workdir_trap);
+               ofs->workdir_trap = NULL;
+
                err = ovl_get_indexdir(sb, ofs, oe, &upperpath);
                if (err)
                        goto out_free_oe;
 
                /* Force r/o mount with no index dir */
-               if (!ofs->indexdir) {
-                       dput(ofs->workdir);
-                       ofs->workdir = NULL;
+               if (ofs->indexdir)
+                       ofs->workdir = dget(ofs->indexdir);
+               else
                        sb->s_flags |= SB_RDONLY;
-               }
-
        }
 
        err = ovl_check_overlapping_layers(sb, ofs);