From: Jaegeuk Kim Date: Thu, 11 Jun 2015 21:23:05 +0000 (-0700) Subject: f2fs crypto: fix to handle errors likewise ext4 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7e8e754a4b722216d18418b36c4b8976e7418f2b;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git f2fs crypto: fix to handle errors likewise ext4 This patch makes some error handling policies same with ext4. Signed-off-by: Jaegeuk Kim --- diff --git a/fs/f2fs/crypto.c b/fs/f2fs/crypto.c index be6af181e0f2..75d62fff8960 100644 --- a/fs/f2fs/crypto.c +++ b/fs/f2fs/crypto.c @@ -112,7 +112,7 @@ struct f2fs_crypto_ctx *f2fs_get_crypto_ctx(struct inode *inode) struct f2fs_crypt_info *ci = F2FS_I(inode)->i_crypt_info; if (ci == NULL) - return ERR_PTR(-EACCES); + return ERR_PTR(-ENOKEY); /* * We first try getting the ctx from a free list because in @@ -457,8 +457,8 @@ int f2fs_decrypt_one(struct inode *inode, struct page *page) struct f2fs_crypto_ctx *ctx = f2fs_get_crypto_ctx(inode); int ret; - if (!ctx) - return -ENOMEM; + if (IS_ERR(ctx)) + return PTR_ERR(ctx); ret = f2fs_decrypt(ctx, page); f2fs_release_crypto_ctx(ctx); return ret;