1 files changed, 24 insertions, 61 deletions

diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
index dfcc68484f47..11f5e5076aef 100644
--- a/fs/ecryptfs/inode.c
+++ b/fs/ecryptfs/inode.c
@@ -30,6 +30,7 @@
 #include <linux/namei.h>
 #include <linux/mount.h>
 #include <linux/crypto.h>
+#include <linux/fs_stack.h>
 #include "ecryptfs_kernel.h"
 
 static struct dentry *lock_parent(struct dentry *dentry)
@@ -53,48 +54,6 @@ static void unlock_dir(struct dentry *dir)
         dput(dir);
 }
 
-void ecryptfs_copy_inode_size(struct inode *dst, const struct inode *src)
-{
-        i_size_write(dst, i_size_read((struct inode *)src));
-        dst->i_blocks = src->i_blocks;
-}
-
-void ecryptfs_copy_attr_atime(struct inode *dest, const struct inode *src)
-{
-        dest->i_atime = src->i_atime;
-}
-
-static void ecryptfs_copy_attr_times(struct inode *dest,
-                                     const struct inode *src)
-{
-        dest->i_atime = src->i_atime;
-        dest->i_mtime = src->i_mtime;
-        dest->i_ctime = src->i_ctime;
-}
-
-static void ecryptfs_copy_attr_timesizes(struct inode *dest,
-                                         const struct inode *src)
-{
-        dest->i_atime = src->i_atime;
-        dest->i_mtime = src->i_mtime;
-        dest->i_ctime = src->i_ctime;
-        ecryptfs_copy_inode_size(dest, src);
-}
-
-void ecryptfs_copy_attr_all(struct inode *dest, const struct inode *src)
-{
-        dest->i_mode = src->i_mode;
-        dest->i_nlink = src->i_nlink;
-        dest->i_uid = src->i_uid;
-        dest->i_gid = src->i_gid;
-        dest->i_rdev = src->i_rdev;
-        dest->i_atime = src->i_atime;
-        dest->i_mtime = src->i_mtime;
-        dest->i_ctime = src->i_ctime;
-        dest->i_blkbits = src->i_blkbits;
-        dest->i_flags = src->i_flags;
-}
-
 /**
  * ecryptfs_create_underlying_file
  * @lower_dir_inode: inode of the parent in the lower fs of the new file
@@ -171,8 +130,8 @@ ecryptfs_do_create(struct inode *directory_inode,
                 ecryptfs_printk(KERN_ERR, "Failure in ecryptfs_interpose\n");
                 goto out_lock;
         }
-        ecryptfs_copy_attr_timesizes(directory_inode,
-                                     lower_dir_dentry->d_inode);
+        fsstack_copy_attr_times(directory_inode, lower_dir_dentry->d_inode);
+        fsstack_copy_inode_size(directory_inode, lower_dir_dentry->d_inode);
 out_lock:
         unlock_dir(lower_dir_dentry);
 out:
@@ -196,7 +155,7 @@ static int grow_file(struct dentry *ecryptfs_dentry, struct file *lower_file,
         struct ecryptfs_file_info tmp_file_info;
 
         memset(&fake_file, 0, sizeof(fake_file));
-        fake_file.f_dentry = ecryptfs_dentry;
+        fake_file.f_path.dentry = ecryptfs_dentry;
         memset(&tmp_file_info, 0, sizeof(tmp_file_info));
         ecryptfs_set_file_private(&fake_file, &tmp_file_info);
         ecryptfs_set_file_lower(&fake_file, lower_file);
@@ -365,11 +324,11 @@ static struct dentry *ecryptfs_lookup(struct inode *dir, struct dentry *dentry,
                 "d_name.name = [%s]\n", lower_dentry,
                 lower_dentry->d_name.name);
         lower_inode = lower_dentry->d_inode;
-        ecryptfs_copy_attr_atime(dir, lower_dir_dentry->d_inode);
+        fsstack_copy_attr_atime(dir, lower_dir_dentry->d_inode);
         BUG_ON(!atomic_read(&lower_dentry->d_count));
         ecryptfs_set_dentry_private(dentry,
                                     kmem_cache_alloc(ecryptfs_dentry_info_cache,
-                                                     SLAB_KERNEL));
+                                                     GFP_KERNEL));
         if (!ecryptfs_dentry_to_private(dentry)) {
                 rc = -ENOMEM;
                 ecryptfs_printk(KERN_ERR, "Out of memory whilst attempting "
@@ -404,7 +363,7 @@ static struct dentry *ecryptfs_lookup(struct inode *dir, struct dentry *dentry,
         /* Released in this function */
         page_virt =
             (char *)kmem_cache_alloc(ecryptfs_header_cache_2,
-                                     SLAB_USER);
+                                     GFP_USER);
         if (!page_virt) {
                 rc = -ENOMEM;
                 ecryptfs_printk(KERN_ERR,
@@ -462,7 +421,8 @@ static int ecryptfs_link(struct dentry *old_dentry, struct inode *dir,
         rc = ecryptfs_interpose(lower_new_dentry, new_dentry, dir->i_sb, 0);
         if (rc)
                 goto out_lock;
-        ecryptfs_copy_attr_timesizes(dir, lower_new_dentry->d_inode);
+        fsstack_copy_attr_times(dir, lower_new_dentry->d_inode);
+        fsstack_copy_inode_size(dir, lower_new_dentry->d_inode);
         old_dentry->d_inode->i_nlink =
                 ecryptfs_inode_to_lower(old_dentry->d_inode)->i_nlink;
         i_size_write(new_dentry->d_inode, file_size_save);
@@ -488,7 +448,7 @@ static int ecryptfs_unlink(struct inode *dir, struct dentry *dentry)
                 printk(KERN_ERR "Error in vfs_unlink; rc = [%d]\n", rc);
                 goto out_unlock;
         }
-        ecryptfs_copy_attr_times(dir, lower_dir_inode);
+        fsstack_copy_attr_times(dir, lower_dir_inode);
         dentry->d_inode->i_nlink =
                 ecryptfs_inode_to_lower(dentry->d_inode)->i_nlink;
         dentry->d_inode->i_ctime = dir->i_ctime;
@@ -527,7 +487,8 @@ static int ecryptfs_symlink(struct inode *dir, struct dentry *dentry,
         rc = ecryptfs_interpose(lower_dentry, dentry, dir->i_sb, 0);
         if (rc)
                 goto out_lock;
-        ecryptfs_copy_attr_timesizes(dir, lower_dir_dentry->d_inode);
+        fsstack_copy_attr_times(dir, lower_dir_dentry->d_inode);
+        fsstack_copy_inode_size(dir, lower_dir_dentry->d_inode);
 out_lock:
         unlock_dir(lower_dir_dentry);
         dput(lower_dentry);
@@ -550,7 +511,8 @@ static int ecryptfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
         rc = ecryptfs_interpose(lower_dentry, dentry, dir->i_sb, 0);
         if (rc)
                 goto out;
-        ecryptfs_copy_attr_timesizes(dir, lower_dir_dentry->d_inode);
+        fsstack_copy_attr_times(dir, lower_dir_dentry->d_inode);
+        fsstack_copy_inode_size(dir, lower_dir_dentry->d_inode);
         dir->i_nlink = lower_dir_dentry->d_inode->i_nlink;
 out:
         unlock_dir(lower_dir_dentry);
@@ -573,7 +535,7 @@ static int ecryptfs_rmdir(struct inode *dir, struct dentry *dentry)
         dput(lower_dentry);
         if (!rc)
                 d_delete(lower_dentry);
-        ecryptfs_copy_attr_times(dir, lower_dir_dentry->d_inode);
+        fsstack_copy_attr_times(dir, lower_dir_dentry->d_inode);
         dir->i_nlink = lower_dir_dentry->d_inode->i_nlink;
         unlock_dir(lower_dir_dentry);
         if (!rc)
@@ -597,7 +559,8 @@ ecryptfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev)
         rc = ecryptfs_interpose(lower_dentry, dentry, dir->i_sb, 0);
         if (rc)
                 goto out;
-        ecryptfs_copy_attr_timesizes(dir, lower_dir_dentry->d_inode);
+        fsstack_copy_attr_times(dir, lower_dir_dentry->d_inode);
+        fsstack_copy_inode_size(dir, lower_dir_dentry->d_inode);
 out:
         unlock_dir(lower_dir_dentry);
         if (!dentry->d_inode)
@@ -626,9 +589,9 @@ 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, NULL);
         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, NULL);
 out_lock:
         unlock_rename(lower_old_dir_dentry, lower_new_dir_dentry);
         dput(lower_new_dentry->d_parent);
@@ -684,8 +647,8 @@ ecryptfs_readlink(struct dentry *dentry, char __user * buf, int bufsiz)
                                 rc = -EFAULT;
                 }
                 kfree(decoded_name);
-                ecryptfs_copy_attr_atime(dentry->d_inode,
-                                         lower_dentry->d_inode);
+                fsstack_copy_attr_atime(dentry->d_inode,
+                                        lower_dentry->d_inode);
         }
 out_free_lower_buf:
         kfree(lower_buf);
@@ -791,11 +754,11 @@ int ecryptfs_truncate(struct dentry *dentry, loff_t new_length)
          * the file in the underlying filesystem so that the
          * truncation has an effect there as well. */
         memset(&fake_ecryptfs_file, 0, sizeof(fake_ecryptfs_file));
-        fake_ecryptfs_file.f_dentry = dentry;
+        fake_ecryptfs_file.f_path.dentry = dentry;
         /* Released at out_free: label */
         ecryptfs_set_file_private(&fake_ecryptfs_file,
                                   kmem_cache_alloc(ecryptfs_file_info_cache,
-                                                   SLAB_KERNEL));
+                                                   GFP_KERNEL));
         if (unlikely(!ecryptfs_file_to_private(&fake_ecryptfs_file))) {
                 rc = -ENOMEM;
                 goto out;
@@ -915,7 +878,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, NULL);
         return rc;
 }