Overlayfs use index dir as work dir
Amir Goldstein
maintainercover Overlayfs use index dir as work dir
Miklos,
I know its a bit early in the cycle for patches, but those are needed for the whiteout sharing patch by Chengguang Xu and they are quite trivial, so I figured I'll just post them early to see if there are any comments.
Thanks,
Amir.
Amir Goldstein (3):
ovl: cleanup non-empty directories in ovl_indexdir_cleanup()
ovl: prepare to copy up without workdir
ovl: index dir act as work dir
fs/overlayfs/copy_up.c | 8 ++++++-- fs/overlayfs/overlayfs.h | 4 ++-- fs/overlayfs/readdir.c | 13 +++++++------ fs/overlayfs/super.c | 14 +++++++++----- 4 files changed, 24 insertions(+), 15 deletions(-)
Signature · 1 line
2.17.1
Amir Goldstein
maintainerPATCH 1/3 ovl: cleanup non-empty directories in ovl_indexdir_cleanup()
Teach ovl_indexdir_cleanup() to remove temp directories containing whiteouts to prepare for using index dir instead of work dir for removing merge directories.
--- fs/overlayfs/overlayfs.h | 4 ++-- fs/overlayfs/readdir.c | 13 +++++++------ 2 files changed, 9 insertions(+), 8 deletions(-)
fs/overlayfs/overlayfs.h +2 -2
@@ -394,8 +394,8 @@ void ovl_cleanup_whiteouts(struct dentry *upper, struct list_head *list);void ovl_cache_free (struct list_head *list);void ovl_dir_cache_free (struct inode *inode);int ovl_check_d_type_supported (struct path *realpath); -void ovl_workdir_cleanup (struct inode *dir,struct vfsmount *mnt, -struct dentry *dentry,int level); +int ovl_workdir_cleanup (struct inode *dir,struct vfsmount *mnt, +struct dentry *dentry,int level);int ovl_indexdir_cleanup (struct ovl_fs *ofs);/* inode.c */
fs/overlayfs/readdir.c +7 -6
@@ -1071,14 +1071,13 @@ static void ovl_workdir_cleanup_recurse(struct path *path, int level)ovl_cache_free (&list); } -void ovl_workdir_cleanup (struct inode *dir,struct vfsmount *mnt, +int ovl_workdir_cleanup (struct inode *dir,struct vfsmount *mnt,struct dentry *dentry,int level) {int err;if (!d_is_dir (dentry) || level >1 ) { -ovl_cleanup (dir, dentry); -return ; +return ovl_cleanup (dir, dentry); } err =ovl_do_rmdir (dir, dentry);
@@ -1088,8 +1087,10 @@ void ovl_workdir_cleanup(struct inode *dir, struct vfsmount *mnt,inode_unlock (dir);ovl_workdir_cleanup_recurse (&path, level +1 );inode_lock_nested (dir,I_MUTEX_PARENT ); -ovl_cleanup (dir, dentry); + err =ovl_cleanup (dir, dentry); } + +return err; }int ovl_indexdir_cleanup (struct ovl_fs *ofs)
@@ -1132,8 +1133,8 @@ int ovl_indexdir_cleanup(struct ovl_fs *ofs)if (!err) { goto next; }else if (err == -ESTALE ) { -/* Cleanup stale index entries */ - err =ovl_cleanup (dir, index); +/* Cleanup stale index entries and leftover whiteouts */ + err =ovl_workdir_cleanup (dir, path.mnt, index,1 ); }else if (err != -ENOENT ) {/* * Abort mount to avoid corrupting the index if
Signature · 1 line
2.17.1
Miklos Szeredi
maintainerRe: [PATCH 1/3] ovl: cleanup non-empty directories in ovl_indexdir_cleanup()
Quoted 60 lines · Amir Goldstein
Teach
ovl_indexdir_cleanup()to remove temp directories containing whiteouts to prepare for using index dir instead of work dir for removing merge directories.Signed-off-by Amir Goldstein <[email protected]>--- fs/overlayfs/overlayfs.h | 4 ++-- fs/overlayfs/readdir.c | 13 +++++++------ 2 files changed, 9 insertions(+), 8 deletions(-)fs/overlayfs/overlayfs.h +2
-2@@ -394,8 +394,8 @@ void ovl_cleanup_whiteouts(struct dentry *upper, struct list_head *list);void ovl_cache_free (struct list_head *list);void ovl_dir_cache_free (struct inode *inode);int ovl_check_d_type_supported (struct path *realpath); -void ovl_workdir_cleanup (struct inode *dir,struct vfsmount *mnt, -struct dentry *dentry,int level); +int ovl_workdir_cleanup (struct inode *dir,struct vfsmount *mnt, +struct dentry *dentry,int level);int ovl_indexdir_cleanup (struct ovl_fs *ofs);/* inode.c */ fs/overlayfs/readdir.c +5
-4@@ -1071,14 +1071,13 @@ static void ovl_workdir_cleanup_recurse(struct path *path, int level)ovl_cache_free (&list); } -void ovl_workdir_cleanup (struct inode *dir,struct vfsmount *mnt, +int ovl_workdir_cleanup (struct inode *dir,struct vfsmount *mnt,struct dentry *dentry,int level) {int err;if (!d_is_dir (dentry) || level >1 ) { -ovl_cleanup (dir, dentry); -return ; +return ovl_cleanup (dir, dentry); } err =ovl_do_rmdir (dir, dentry);@@ -1088,8 +1087,10 @@ void ovl_workdir_cleanup(struct inode *dir, struct vfsmount *mnt,inode_unlock (dir);ovl_workdir_cleanup_recurse (&path, level +1 );inode_lock_nested (dir,I_MUTEX_PARENT ); -ovl_cleanup (dir, dentry); + err =ovl_cleanup (dir, dentry); } + +return err; }int ovl_indexdir_cleanup (struct ovl_fs *ofs)
fs/overlayfs/readdir.c int ovl_indexdir_cleanup(struct ovl_fs *ofs) · line 1137
Quoted 7 lines
fs/overlayfs/readdir.c +2
-2@@ -1132,8 +1133,8 @@ int ovl_indexdir_cleanup(struct ovl_fs *ofs)if (!err) { goto next; }else if (err == -ESTALE ) { -/* Cleanup stale index entries */ - err =ovl_cleanup (dir, index); +/* Cleanup stale index entries and leftover whiteouts */ + err =ovl_workdir_cleanup (dir, path.mnt, index,1 );
I'd much prefer if cleanup of temp files were handled separately from stale index entries. I.e. only call ovl_verify_index() on things that might actually be index files.
Quoted 6 lines
fs/overlayfs/readdir.c +0
-1}else if (err != -ENOENT ) {/* * Abort mount to avoid corrupting the index if -- 2.17.1
Amir Goldstein
maintainerRe: [PATCH 1/3] ovl: cleanup non-empty directories in ovl_indexdir_cleanup()
Quoted 60 lines · Miklos Szeredi
Quoted 58 lines · Amir Goldstein
Teach
ovl_indexdir_cleanup()to remove temp directories containing whiteouts to prepare for using index dir instead of work dir for removing merge directories.Signed-off-by Amir Goldstein <[email protected]>--- fs/overlayfs/overlayfs.h | 4 ++-- fs/overlayfs/readdir.c | 13 +++++++------ 2 files changed, 9 insertions(+), 8 deletions(-)fs/overlayfs/overlayfs.h +2
-2@@ -394,8 +394,8 @@ void ovl_cleanup_whiteouts(struct dentry *upper, struct list_head *list);void ovl_cache_free (struct list_head *list);void ovl_dir_cache_free (struct inode *inode);int ovl_check_d_type_supported (struct path *realpath); -void ovl_workdir_cleanup (struct inode *dir,struct vfsmount *mnt, -struct dentry *dentry,int level); +int ovl_workdir_cleanup (struct inode *dir,struct vfsmount *mnt, +struct dentry *dentry,int level);int ovl_indexdir_cleanup (struct ovl_fs *ofs);/* inode.c */ fs/overlayfs/readdir.c +5
-4@@ -1071,14 +1071,13 @@ static void ovl_workdir_cleanup_recurse(struct path *path, int level)ovl_cache_free (&list); } -void ovl_workdir_cleanup (struct inode *dir,struct vfsmount *mnt, +int ovl_workdir_cleanup (struct inode *dir,struct vfsmount *mnt,struct dentry *dentry,int level) {int err;if (!d_is_dir (dentry) || level >1 ) { -ovl_cleanup (dir, dentry); -return ; +return ovl_cleanup (dir, dentry); } err =ovl_do_rmdir (dir, dentry);@@ -1088,8 +1087,10 @@ void ovl_workdir_cleanup(struct inode *dir, struct vfsmount *mnt,inode_unlock (dir);ovl_workdir_cleanup_recurse (&path, level +1 );inode_lock_nested (dir,I_MUTEX_PARENT ); -ovl_cleanup (dir, dentry); + err =ovl_cleanup (dir, dentry); } + +return err; }
Quoted 14 lines
fs/overlayfs/readdir.c int ovl_indexdir_cleanup(struct ovl_fs *ofs) · line 1137
Quoted 9 lines
fs/overlayfs/readdir.c +2
-2int ovl_indexdir_cleanup (struct ovl_fs *ofs)@@ -1132,8 +1133,8 @@ int ovl_indexdir_cleanup(struct ovl_fs *ofs)if (!err) { goto next; }else if (err == -ESTALE ) { -/* Cleanup stale index entries */ - err =ovl_cleanup (dir, index); +/* Cleanup stale index entries and leftover whiteouts */ + err =ovl_workdir_cleanup (dir, path.mnt, index,1 );I'd much prefer if cleanup of temp files were handled separately from stale index entries. I.e. only call
ovl_verify_index()on things that might actually be index files.
Ok. fixed tested and pushed to ovl-workdir.
Thanks,
Amir.
Miklos Szeredi
maintainerRe: [PATCH 1/3] ovl: cleanup non-empty directories in ovl_indexdir_cleanup()
Quoted 1 line · Amir Goldstein
Ok. fixed tested and pushed to ovl-workdir.
Thanks. Pushed to #overlayfs-next.
Thanks,
Miklos
Amir Goldstein
maintainerPATCH 2/3 ovl: prepare to copy up without workdir
In reply to Amir GoldsteinWith 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.
--- fs/overlayfs/copy_up.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
fs/overlayfs/copy_up.c +6 -2
@@ -576,7 +576,7 @@ static int ovl_copy_up_workdir(struct ovl_copy_up_ctx *c)struct inode *udir =d_inode (c->destdir), *wdir =d_inode (c->workdir);struct dentry *temp, *upper;struct ovl_cu_creds cc; -int err; +int err =0 ;struct ovl_cattr cattr = {/* Can't properly set mode on creation because of the umask */ .mode = c->stat.mode &S_IFMT ,
@@ -584,7 +584,11 @@ static int ovl_copy_up_workdir(struct ovl_copy_up_ctx *c) .link = c->link }; - err =ovl_lock_rename_workdir (c->workdir, c->destdir); +/* Are we copying up to indexdir which is also workdir? */ +if (c->indexed && c->workdir == c->destdir) +inode_lock_nested (wdir,I_MUTEX_PARENT ); +else + err =ovl_lock_rename_workdir (c->workdir, c->destdir);if (err)return err;
Signature · 1 line
2.17.1
Miklos Szeredi
maintainerRe: [PATCH 2/3] ovl: prepare to copy up without workdir
Quoted 24 lines · Amir Goldstein
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 <[email protected]>--- fs/overlayfs/copy_up.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)fs/overlayfs/copy_up.c +1
-1@@ -576,7 +576,7 @@ static int ovl_copy_up_workdir(struct ovl_copy_up_ctx *c)struct inode *udir =d_inode (c->destdir), *wdir =d_inode (c->workdir);struct dentry *temp, *upper;struct ovl_cu_creds cc; -int err; +int err =0 ;struct ovl_cattr cattr = {/* Can't properly set mode on creation because of the umask */ .mode = c->stat.mode &S_IFMT ,
fs/overlayfs/copy_up.c static int ovl_copy_up_workdir(struct ovl_copy_up_ctx *c) · line 591
Quoted 9 lines
fs/overlayfs/copy_up.c +5
-1@@ -584,7 +584,11 @@ static int ovl_copy_up_workdir(struct ovl_copy_up_ctx *c) .link = c->link }; - err =ovl_lock_rename_workdir (c->workdir, c->destdir); +/* Are we copying up to indexdir which is also workdir? */ +if (c->indexed && c->workdir == c->destdir) +inode_lock_nested (wdir,I_MUTEX_PARENT ); +else + err =ovl_lock_rename_workdir (c->workdir, c->destdir);
This is confusing. What about just
if (!lock_rename(c->workdir, c->destdir))
return -EIO;
?
Thanks,
Miklos
Amir Goldstein
maintainerRe: [PATCH 2/3] ovl: prepare to copy up without workdir
Quoted 38 lines · Miklos Szeredi
Quoted 24 lines · Amir Goldstein
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 <[email protected]>--- fs/overlayfs/copy_up.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)fs/overlayfs/copy_up.c +1
-1@@ -576,7 +576,7 @@ static int ovl_copy_up_workdir(struct ovl_copy_up_ctx *c)struct inode *udir =d_inode (c->destdir), *wdir =d_inode (c->workdir);struct dentry *temp, *upper;struct ovl_cu_creds cc; -int err; +int err =0 ;struct ovl_cattr cattr = {/* Can't properly set mode on creation because of the umask */ .mode = c->stat.mode &S_IFMT ,fs/overlayfs/copy_up.c static int ovl_copy_up_workdir(struct ovl_copy_up_ctx *c) · line 591
Quoted 9 lines
fs/overlayfs/copy_up.c +5
-1@@ -584,7 +584,11 @@ static int ovl_copy_up_workdir(struct ovl_copy_up_ctx *c) .link = c->link }; - err =ovl_lock_rename_workdir (c->workdir, c->destdir); +/* Are we copying up to indexdir which is also workdir? */ +if (c->indexed && c->workdir == c->destdir) +inode_lock_nested (wdir,I_MUTEX_PARENT ); +else + err =ovl_lock_rename_workdir (c->workdir, c->destdir);This is confusing. What about just
Quoted 4 lines
if (!lock_rename(c->workdir,
c->destdir))return -EIO;?
Sure. Simple.
Thanks,
Amir.
Amir Goldstein
maintainerPATCH 3/3 ovl: index dir act as work dir
In reply to Amir GoldsteinWith 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.
---
Miklos,
It is worth mentioning that I contemplated about the right point to overload workdir with indexdir.
I decided to go for ofs->workdir and not ovl_workdir(), because it makes the patch touch less code and avoids future uninterntional uses of ofs->workdir after 'work' dir has been retired.
That said, I do not feel strongly about it, so I could go for ovl_workdir() if you prefer.
I do feel strongly about the decision to keep 'work' dir for index=off case.
Thanks,
Amir.
fs/overlayfs/super.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
fs/overlayfs/super.c +9 -5
@@ -1777,17 +1777,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);
Signature · 1 line
2.17.1
Miklos Szeredi
maintainerRe: [PATCH 3/3] ovl: index dir act as work dir
Quoted 26 lines · Amir Goldstein
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 <[email protected]>---
Miklos,
It is worth mentioning that I contemplated about the right point to overload workdir with indexdir.
I decided to go for
ofs->workdirand notovl_workdir(), because it makes the patch touch less code and avoids future uninterntional uses ofofs->workdirafter 'work' dir has been retired.
Quoted 5 lines
That said, I do not feel strongly about it, so I could go for
ovl_workdir()if you prefer.I do feel strongly about the decision to keep 'work' dir for index=off case.
Yeah, this looks good.
Thanks,
Miklos