Merge branch 'linus' into sched/urgent

[linux-2.6] / fs / ecryptfs / main.c

diff --git a/fs/ecryptfs/main.c b/fs/ecryptfs/main.c
index ee4f84b204106aa3b2c4ce6827212f754650b663..448dfd597b5f5d696a480bd33148873317598b84 100644 (file)
--- a/fs/ecryptfs/main.c
+++ b/fs/ecryptfs/main.c
@@ -201,22 +201,6 @@ int ecryptfs_interpose(struct dentry *lower_dentry, struct dentry *dentry,
        /* This size will be overwritten for real files w/ headers and
         * other metadata */
        fsstack_copy_inode_size(inode, lower_inode);
-       if (!(flags & ECRYPTFS_INTERPOSE_FLAG_DELAY_PERSISTENT_FILE)) {
-               rc = ecryptfs_init_persistent_file(dentry);
-               if (rc) {
-                       printk(KERN_ERR "%s: Error attempting to initialize "
-                              "the persistent file for the dentry with name "
-                              "[%s]; rc = [%d]\n", __func__,
-                              dentry->d_name.name, rc);
-                       goto out;
-               }
-       } else {
-               struct ecryptfs_inode_info *inode_info =
-                       ecryptfs_inode_to_private(dentry->d_inode);
-
-               inode_info->lower_file = NULL;
-               inode_info->crypt_stat.flags |= ECRYPTFS_DELAY_PERSISTENT;
-       }
 out:
        return rc;
 }
@@ -594,7 +578,7 @@ static struct file_system_type ecryptfs_fs_type = {
  * Initializes the ecryptfs_inode_info_cache when it is created
  */
 static void
-inode_info_init_once(struct kmem_cache *cachep, void *vptr)
+inode_info_init_once(void *vptr)
 {
        struct ecryptfs_inode_info *ei = (struct ecryptfs_inode_info *)vptr;
 
@@ -605,7 +589,7 @@ static struct ecryptfs_cache_info {
        struct kmem_cache **cache;
        const char *name;
        size_t size;
-       void (*ctor)(struct kmem_cache *cache, void *obj);
+       void (*ctor)(void *obj);
 } ecryptfs_cache_infos[] = {
        {
                .cache = &ecryptfs_auth_tok_list_item_cache,