From 0ce7194da2177e58533c7227ae1600f52e70cc27 Mon Sep 17 00:00:00 2001 From: Erez_Zadok Date: Tue, 3 Jul 2007 19:06:31 -0400 Subject: [PATCH] ecryptfs: update to new API of fsstack_copy_attr_all Remove obsolete third argument to fsstack_copy_attr_all which was always NULL for ecryptfs. Signed-off-by: Erez Zadok Conflicts: fs/ecryptfs/dentry.c fs/ecryptfs/inode.c fs/ecryptfs/main.c --- fs/ecryptfs/dentry.c | 2 +- fs/ecryptfs/inode.c | 7 ++++--- fs/ecryptfs/main.c | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/fs/ecryptfs/dentry.c b/fs/ecryptfs/dentry.c index 52d1e36dc74..5bf742f2c05 100644 --- a/fs/ecryptfs/dentry.c +++ b/fs/ecryptfs/dentry.c @@ -61,7 +61,7 @@ static int ecryptfs_d_revalidate(struct dentry *dentry, struct nameidata *nd) struct inode *lower_inode = ecryptfs_inode_to_lower(dentry->d_inode); - ecryptfs_copy_attr_all(dentry->d_inode, lower_inode); + fsstack_copy_attr_all(dentry->d_inode, lower_inode); } out: return rc; diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c index 78a8f3723df..a273e048b80 100644 --- a/fs/ecryptfs/inode.c +++ b/fs/ecryptfs/inode.c @@ -632,9 +632,10 @@ ecryptfs_rename(struct inode *old_dir, struct dentry *old_dentry, lower_new_dir_dentry->d_inode, lower_new_dentry); if (rc) goto out_lock; - ecryptfs_copy_attr_all(new_dir, lower_new_dir_dentry->d_inode); + fsstack_copy_attr_all(new_dir, lower_new_dir_dentry->d_inode); + if (new_dir != old_dir) - ecryptfs_copy_attr_all(old_dir, lower_old_dir_dentry->d_inode); + fsstack_copy_attr_all(old_dir, lower_old_dir_dentry->d_inode); out_lock: unlock_rename(lower_old_dir_dentry, lower_new_dir_dentry); dput(lower_new_dentry->d_parent); @@ -921,7 +922,7 @@ static int ecryptfs_setattr(struct dentry *dentry, struct iattr *ia) } rc = notify_change(lower_dentry, ia); out: - ecryptfs_copy_attr_all(inode, lower_inode); + fsstack_copy_attr_all(inode, lower_inode); return rc; } diff --git a/fs/ecryptfs/main.c b/fs/ecryptfs/main.c index a78d87d14ba..0cbfbfabf42 100644 --- a/fs/ecryptfs/main.c +++ b/fs/ecryptfs/main.c @@ -112,7 +112,7 @@ int ecryptfs_interpose(struct dentry *lower_dentry, struct dentry *dentry, d_add(dentry, inode); else d_instantiate(dentry, inode); - ecryptfs_copy_attr_all(inode, lower_inode); + fsstack_copy_attr_all(inode, lower_inode); /* This size will be overwritten for real files w/ headers and * other metadata */ ecryptfs_copy_inode_size(inode, lower_inode); -- 2.43.0