From: Theodore Ts'o <tytso@mit.edu>
Date: Mon, 8 Jun 2015 15:54:56 +0000 (-0400)
Subject: ext4 crypto: fix ext4_get_crypto_ctx()'s calling convention in ext4_decrypt_one
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=ad0a0ce894d554b112afab6a48fd500e636686a6;p=deliverable%2Flinux.git

ext4 crypto: fix ext4_get_crypto_ctx()'s calling convention in ext4_decrypt_one

Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---

diff --git a/fs/ext4/crypto.c b/fs/ext4/crypto.c
index f5c82e8b7b5c..45731558138c 100644
--- a/fs/ext4/crypto.c
+++ b/fs/ext4/crypto.c
@@ -396,8 +396,8 @@ int ext4_decrypt_one(struct inode *inode, struct page *page)
 
 	struct ext4_crypto_ctx *ctx = ext4_get_crypto_ctx(inode);
 
-	if (!ctx)
-		return -ENOMEM;
+	if (IS_ERR(ctx))
+		return PTR_ERR(ctx);
 	ret = ext4_decrypt(ctx, page);
 	ext4_release_crypto_ctx(ctx);
 	return ret;