summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2015-06-08 17:54:56 +0200
committerTheodore Ts'o <tytso@mit.edu>2015-06-08 17:54:56 +0200
commitad0a0ce894d554b112afab6a48fd500e636686a6 (patch)
treef3221502edb81622db9ed7e9320bc4574f33d675
parentext4: return error code from ext4_mb_good_group() (diff)
downloadlinux-ad0a0ce894d554b112afab6a48fd500e636686a6.tar.xz
linux-ad0a0ce894d554b112afab6a48fd500e636686a6.zip
ext4 crypto: fix ext4_get_crypto_ctx()'s calling convention in ext4_decrypt_one
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
-rw-r--r--fs/ext4/crypto.c4
1 files changed, 2 insertions, 2 deletions
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;