Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

[deliverable/linux.git] / fs / ecryptfs / inode.c

diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
index a4dddc61594cbdb7797b1a75cd50fae0ec3a6e77..040aa879d634fe15d38f0ce9bf103c7b514122b4 100644 (file)
--- a/fs/ecryptfs/inode.c
+++ b/fs/ecryptfs/inode.c
@@ -282,9 +282,7 @@ ecryptfs_create(struct inode *directory_inode, struct dentry *ecryptfs_dentry,
        if (rc) {
                ecryptfs_do_unlink(directory_inode, ecryptfs_dentry,
                                   ecryptfs_inode);
-               make_bad_inode(ecryptfs_inode);
-               unlock_new_inode(ecryptfs_inode);
-               iput(ecryptfs_inode);
+               iget_failed(ecryptfs_inode);
                goto out;
        }
        unlock_new_inode(ecryptfs_inode);