Unionfs: branch management/configuration fixes

Remove unnecessary calls to update branch m/ctimes, and use them only when
needed.  Update branch vfsmounts after operations that could cause a copyup.

Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>

diff --git a/fs/unionfs/commonfops.c b/fs/unionfs/commonfops.c
index 69990b352ee04bd62e6a99c7dd2866fb2af9fdea..854deffa5d7631d65395eacffb0b4f0161082c46 100644 (file)
--- a/fs/unionfs/commonfops.c
+++ b/fs/unionfs/commonfops.c
@@ -604,6 +604,7 @@ out:
        }
 out_nofree:
        if (!err) {
+               unionfs_postcopyup_setmnt(dentry);
                unionfs_copy_attr_times(inode);
                unionfs_check_file(file);
                unionfs_check_inode(inode);
@@ -837,13 +838,9 @@ int unionfs_flush(struct file *file)
 
        }
 
-       /* on success, update our times */
-       unionfs_copy_attr_times(dentry->d_inode);
-       /* parent time could have changed too (async) */
-       unionfs_copy_attr_times(dentry->d_parent->d_inode);
-
 out:
-       unionfs_check_file(file);
+       if (!err)
+               unionfs_check_file(file);
        unionfs_unlock_dentry(file->f_dentry);
        unionfs_read_unlock(dentry->d_sb);
        return err;

diff --git a/fs/unionfs/copyup.c b/fs/unionfs/copyup.c
index bf166a569231c38b899f5bbfb5a7b34e6b94a5bf..45cff2220bf02c74c73e93a8b12566a28306e0a8 100644 (file)
--- a/fs/unionfs/copyup.c
+++ b/fs/unionfs/copyup.c
@@ -816,7 +816,8 @@ begin:
         * update times of this dentry, but also the parent, because if
         * we changed, the parent may have changed too.
         */
-       unionfs_copy_attr_times(parent_dentry->d_inode);
+       fsstack_copy_attr_times(parent_dentry->d_inode,
+                               lower_parent_dentry->d_inode);
        unionfs_copy_attr_times(child_dentry->d_inode);
 
        parent_dentry = child_dentry;

diff --git a/fs/unionfs/dentry.c b/fs/unionfs/dentry.c
index 266052748ab074559a255088995f2893465a6f59..d81573ce8fb5168dcd57f896b4be689b439d3b8e 100644 (file)
--- a/fs/unionfs/dentry.c
+++ b/fs/unionfs/dentry.c
@@ -476,8 +476,10 @@ static int unionfs_d_revalidate(struct dentry *dentry, struct nameidata *nd)
 
        unionfs_lock_dentry(dentry, UNIONFS_DMUTEX_CHILD);
        err = __unionfs_d_revalidate_chain(dentry, nd, false);
-       if (likely(err > 0)) /* true==1: dentry is valid */
+       if (likely(err > 0)) { /* true==1: dentry is valid */
+               unionfs_postcopyup_setmnt(dentry);
                unionfs_check_dentry(dentry);
+       }
        unionfs_unlock_dentry(dentry);
 
        unionfs_read_unlock(dentry->d_sb);

diff --git a/fs/unionfs/mmap.c b/fs/unionfs/mmap.c
index c795e58a9cf7b9e4ddb0f96626dd81871d433725..378ca3ab2769f15fd028e2dde35dc7cde2aa8991 100644 (file)
--- a/fs/unionfs/mmap.c
+++ b/fs/unionfs/mmap.c
@@ -254,20 +254,11 @@ static int unionfs_prepare_write(struct file *file, struct page *page,
        int err;
 
        unionfs_read_lock(file->f_dentry->d_sb, UNIONFS_SMUTEX_PARENT);
-       /*
-        * This is the only place where we unconditionally copy the lower
-        * attribute times before calling unionfs_file_revalidate.  The
-        * reason is that our ->write calls do_sync_write which in turn will
-        * call our ->prepare_write and then ->commit_write.  Before our
-        * ->write is called, the lower mtimes are in sync, but by the time
-        * the VFS calls our ->commit_write, the lower mtimes have changed.
-        * Therefore, the only reasonable time for us to sync up from the
-        * changed lower mtimes, and avoid an invariant violation warning,
-        * is here, in ->prepare_write.
-        */
-       unionfs_copy_attr_times(file->f_dentry->d_inode);
        err = unionfs_file_revalidate(file, true);
-       unionfs_check_file(file);
+       if (!err) {
+               unionfs_copy_attr_times(file->f_dentry->d_inode);
+               unionfs_check_file(file);
+       }
        unionfs_read_unlock(file->f_dentry->d_sb);
 
        return err;

diff --git a/fs/unionfs/rename.c b/fs/unionfs/rename.c
index 23fdea097eb33728458d5e579d2c886d0d6f0c96..81c5a8714fa46234d47f1b49644fee7606b9131f 100644 (file)
--- a/fs/unionfs/rename.c
+++ b/fs/unionfs/rename.c
@@ -138,6 +138,11 @@ static int __unionfs_rename(struct inode *old_dir, struct dentry *old_dentry,
        err = vfs_rename(lower_old_dir_dentry->d_inode, lower_old_dentry,
                         lower_new_dir_dentry->d_inode, lower_new_dentry);
 out_err_unlock:
+       if (!err) {
+               /* update parent dir times */
+               fsstack_copy_attr_times(old_dir, lower_old_dir_dentry->d_inode);
+               fsstack_copy_attr_times(new_dir, lower_new_dir_dentry->d_inode);
+       }
        unlock_rename(lower_old_dir_dentry, lower_new_dir_dentry);
        lockdep_on();
 
@@ -547,8 +552,6 @@ int unionfs_rename(struct inode *old_dir, struct dentry *old_dentry,
                }
        }
        /* if all of this renaming succeeded, update our times */
-       unionfs_copy_attr_times(old_dir);
-       unionfs_copy_attr_times(new_dir);
        unionfs_copy_attr_times(old_dentry->d_inode);
        unionfs_copy_attr_times(new_dentry->d_inode);
        unionfs_check_inode(old_dir);