f2fs crypto: fix to handle errors likewise ext4
Subsystems (2)
Jaegeuk Kim
maintainerPATCH 1/2 f2fs crypto: fix to handle errors likewise ext4
This patch makes some error handling policies same with ext4.
Signed-off-by Jaegeuk Kim <[email protected]>
--- fs/f2fs/crypto.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/f2fs/crypto.c +3 -3
@@ -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;
Signature · 1 line
2.1.1
Jaegeuk Kim
maintainerPATCH 2/2 f2fs crypto: add alloc_bounce_page
This patch adds alloc_bounce_page likewise ext4.
Signed-off-by Jaegeuk Kim <[email protected]>
--- fs/f2fs/crypto.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-)
fs/f2fs/crypto.c +15 -8
@@ -376,6 +376,15 @@ static int f2fs_page_crypto(struct f2fs_crypto_ctx *ctx,return 0 ; } +static struct page *alloc_bounce_page (struct f2fs_crypto_ctx *ctx) +{ + ctx->w.bounce_page =mempool_alloc (f2fs_bounce_page_pool,GFP_NOWAIT ); +if (ctx->w.bounce_page ==NULL ) +return ERR_PTR (-ENOMEM ); + ctx->flags |=F2FS_WRITE_PATH_FL ; +return ctx->w.bounce_page; +} +/** * f2fs_encrypt() - Encrypts a page * @inode: The inode for which the encryption should take place
@@ -405,19 +414,17 @@ struct page *f2fs_encrypt(struct inode *inode,return (struct page *)ctx;/* The encryption operation will require a bounce page. */ - ciphertext_page =mempool_alloc (f2fs_bounce_page_pool,GFP_NOWAIT ); -if (!ciphertext_page) { - err = -ENOMEM ; + ciphertext_page =alloc_bounce_page (ctx); +if (IS_ERR (ciphertext_page)) goto err_out; - } - ctx->flags |=F2FS_WRITE_PATH_FL ; - ctx->w.bounce_page = ciphertext_page; ctx->w.control_page = plaintext_page; err =f2fs_page_crypto (ctx, inode,F2FS_ENCRYPT , plaintext_page->index, plaintext_page, ciphertext_page); -if (err) +if (err) { + ciphertext_page =ERR_PTR (err); goto err_out; + }SetPagePrivate (ciphertext_page);set_page_private (ciphertext_page, (unsigned long )ctx);
@@ -426,7 +433,7 @@ struct page *f2fs_encrypt(struct inode *inode, err_out:f2fs_release_crypto_ctx (ctx); -return ERR_PTR (err); +return ciphertext_page; }/**
Signature · 4 lines
2.1.1 ------------------------------------------------------------------------------