From: Josef "Jeff" Sipek <[email protected]>
The fsstack tidy patch broke eCryptfs. This patch makes eCryptfs compile
again.
Signed-off-by: Josef "Jeff" Sipek <[email protected]>
diff -r 2187c6b08f02 fs/ecryptfs/inode.c
--- a/fs/ecryptfs/inode.c Tue Oct 17 18:26:24 2006 -0400
+++ b/fs/ecryptfs/inode.c Tue Oct 17 18:29:43 2006 -0400
@@ -621,9 +621,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);
@@ -908,7 +908,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 -r 2187c6b08f02 fs/ecryptfs/main.c
--- a/fs/ecryptfs/main.c Tue Oct 17 18:26:24 2006 -0400
+++ b/fs/ecryptfs/main.c Tue Oct 17 18:31:29 2006 -0400
@@ -116,7 +116,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);