summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJaegeuk Kim <jaegeuk@kernel.org>2015-06-11 14:23:05 -0700
committerJaegeuk Kim <jaegeuk@kernel.org>2015-06-11 15:00:36 -0700
commit7e8e754a4b722216d18418b36c4b8976e7418f2b (patch)
treef733d1a4d73d15200b69c15905cfe79c3af4f88d /fs
parentde6a8ec9822dbe2ce1f5a273cfac9e16032387e2 (diff)
downloadlinux-7e8e754a4b722216d18418b36c4b8976e7418f2b.tar.gz
linux-7e8e754a4b722216d18418b36c4b8976e7418f2b.tar.bz2
linux-7e8e754a4b722216d18418b36c4b8976e7418f2b.zip
f2fs crypto: fix to handle errors likewise ext4
This patch makes some error handling policies same with ext4. Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/f2fs/crypto.c6
1 files changed, 3 insertions, 3 deletions
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;