--- fs/ecryptfs/inode.c

+++ fs/ecryptfs/inode.c

@@ -69,19 +69,15 @@ ecryptfs_create_underlying_file(struct i

struct vfsmount *lower_mnt = ecryptfs_dentry_to_lower_mnt(dentry);

struct dentry *dentry_save;

struct vfsmount *vfsmount_save;

- unsigned int flags_save;

int rc;

dentry_save = nd->path.dentry;

vfsmount_save = nd->path.mnt;

- flags_save = nd->flags;

nd->path.dentry = lower_dentry;

nd->path.mnt = lower_mnt;

- nd->flags &= ~LOOKUP_OPEN;

rc = vfs_create(lower_dir_inode, lower_dentry, mode, nd);

nd->path.dentry = dentry_save;

nd->path.mnt = vfsmount_save;

- nd->flags = flags_save;

return rc;

}

@@ -276,7 +272,7 @@ int ecryptfs_lookup_and_interpose_lower(

printk(KERN_ERR "%s: Out of memory whilst attempting "

"to allocate ecryptfs_dentry_info struct\n",

__func__);

- goto out_put;

+ goto out_dput;

}

ecryptfs_set_dentry_lower(ecryptfs_dentry, lower_dentry);

ecryptfs_set_dentry_lower_mnt(ecryptfs_dentry, lower_mnt);

@@ -349,9 +345,8 @@ int ecryptfs_lookup_and_interpose_lower(

out_free_kmem:

kmem_cache_free(ecryptfs_header_cache_2, page_virt);

goto out;

-out_put:

+out_dput:

dput(lower_dentry);

- mntput(lower_mnt);

d_drop(ecryptfs_dentry);

out:

return rc;