From: Josef "Jeff" Sipek The fsstack tidy patch broke eCryptfs. This patch makes eCryptfs compile again. Signed-off-by: Josef "Jeff" Sipek Cc: Michael Halcrow Signed-off-by: Andrew Morton --- fs/ecryptfs/inode.c | 6 +++--- fs/ecryptfs/main.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff -puN fs/ecryptfs/inode.c~ecryptfs-use-fsstacks-generic-copy-inode-attr-tidy-fix fs/ecryptfs/inode.c --- a/fs/ecryptfs/inode.c~ecryptfs-use-fsstacks-generic-copy-inode-attr-tidy-fix +++ a/fs/ecryptfs/inode.c @@ -588,9 +588,9 @@ ecryptfs_rename(struct inode *old_dir, s lower_new_dir_dentry->d_inode, lower_new_dentry); if (rc) goto out_lock; - fsstack_copy_attr_all(new_dir, lower_new_dir_dentry->d_inode); + fsstack_copy_attr_all(new_dir, lower_new_dir_dentry->d_inode, NULL); if (new_dir != old_dir) - fsstack_copy_attr_all(old_dir, lower_old_dir_dentry->d_inode); + fsstack_copy_attr_all(old_dir, lower_old_dir_dentry->d_inode, NULL); out_lock: unlock_rename(lower_old_dir_dentry, lower_new_dir_dentry); dput(lower_new_dentry); @@ -875,7 +875,7 @@ static int ecryptfs_setattr(struct dentr } rc = notify_change(lower_dentry, ia); out: - fsstack_copy_attr_all(inode, lower_inode); + fsstack_copy_attr_all(inode, lower_inode, NULL); return rc; } diff -puN fs/ecryptfs/main.c~ecryptfs-use-fsstacks-generic-copy-inode-attr-tidy-fix fs/ecryptfs/main.c --- a/fs/ecryptfs/main.c~ecryptfs-use-fsstacks-generic-copy-inode-attr-tidy-fix +++ a/fs/ecryptfs/main.c @@ -113,7 +113,7 @@ int ecryptfs_interpose(struct dentry *lo d_add(dentry, inode); else d_instantiate(dentry, inode); - fsstack_copy_attr_all(inode, lower_inode); + fsstack_copy_attr_all(inode, lower_inode, NULL); /* This size will be overwritten for real files w/ headers and * other metadata */ fsstack_copy_inode_size(inode, lower_inode); _