Unionfs: lock inode around calls to notify_change()

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

diff --git a/fs/unionfs/copyup.c b/fs/unionfs/copyup.c
index 45cff2220bf02c74c73e93a8b12566a28306e0a8..f914840c37644f868652d39a682f107196fbf7f3 100644 (file)
--- a/fs/unionfs/copyup.c
+++ b/fs/unionfs/copyup.c
@@ -135,6 +135,7 @@ static int copyup_permissions(struct super_block *sb,
        newattrs.ia_valid = ATTR_CTIME | ATTR_ATIME | ATTR_MTIME |
                ATTR_ATIME_SET | ATTR_MTIME_SET | ATTR_FORCE |
                ATTR_GID | ATTR_UID;
+       mutex_lock(&new_lower_dentry->d_inode->i_mutex);
        err = notify_change(new_lower_dentry, &newattrs);
        if (err)
                goto out;
@@ -152,6 +153,7 @@ static int copyup_permissions(struct super_block *sb,
        }
 
 out:
+       mutex_unlock(&new_lower_dentry->d_inode->i_mutex);
        return err;
 }
 

diff --git a/fs/unionfs/inode.c b/fs/unionfs/inode.c
index 91eacea77c948dacae1713e3fb4a4df843b27730..fd78681e09b293df4facd7484c77776cff288d63 100644 (file)
--- a/fs/unionfs/inode.c
+++ b/fs/unionfs/inode.c
@@ -1021,7 +1021,9 @@ static int unionfs_setattr(struct dentry *dentry, struct iattr *ia)
        }
 
        /* notify the (possibly copied-up) lower inode */
+       mutex_lock(&lower_dentry->d_inode->i_mutex);
        err = notify_change(lower_dentry, ia);
+       mutex_unlock(&lower_dentry->d_inode->i_mutex);
        if (err)
                goto out;