Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...

[deliverable/linux.git] / fs / aio.c

diff --git a/fs/aio.c b/fs/aio.c
index 1f602d9be4c5b2c2c7bdd41acf56557fb754f438..823efcbb6ccd1dc7936f77890183cee0ac93ed94 100644 (file)
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -163,8 +163,8 @@ static struct file *aio_private_file(struct kioctx *ctx, loff_t nr_pages)
        struct file *file;
        struct path path;
        struct inode *inode = alloc_anon_inode(aio_mnt->mnt_sb);
-       if (!inode)
-               return ERR_PTR(-ENOMEM);
+       if (IS_ERR(inode))
+               return ERR_CAST(inode);
 
        inode->i_mapping->a_ops = &aio_ctx_aops;
        inode->i_mapping->private_data = ctx;