completion_pages() processes endio functionality for a bio that is
intended to read file data from the disk. Hence this commit moves this
function to crypto/readpage.c file.
This commit also makes mandatory the callback function argument for
fscrypt_decrypt_bio_blocks().
Signed-off-by: Chandan Rajendra <chandan@xxxxxxxxxxxxxxxxxx>
---
fs/crypto/bio.c | 48 ++----------------------------------------------
fs/crypto/readpage.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 48 insertions(+), 47 deletions(-)
diff --git a/fs/crypto/bio.c b/fs/crypto/bio.c
index 265cba3..7188495 100644
--- a/fs/crypto/bio.c
+++ b/fs/crypto/bio.c
@@ -26,50 +26,6 @@
#include <linux/namei.h>
#include "fscrypt_private.h"
-/*
- * Call fscrypt_decrypt_page on every single page, reusing the encryption
- * context.
- */
-static void completion_pages(struct work_struct *work)
-{
- struct fscrypt_ctx *ctx =
- container_of(work, struct fscrypt_ctx, r.work);
- struct bio *bio = ctx->r.bio;
- struct bio_vec *bv;
- int i;
-
- bio_for_each_segment_all(bv, bio, i) {
- struct page *page = bv->bv_page;
- struct inode *inode = page->mapping->host;
- const unsigned long blocksize = inode->i_sb->s_blocksize;
- const unsigned int blkbits = inode->i_blkbits;
- u64 page_blk = page->index << (PAGE_SHIFT - blkbits);
- u64 blk = page_blk + (bv->bv_offset >> blkbits);
- int nr_blks = bv->bv_len >> blkbits;
- int ret = 0;
- int j;
-
- for (j = 0; j < nr_blks; j++, blk++) {
- ret = fscrypt_decrypt_block(page->mapping->host,
- page, blocksize,
- bv->bv_offset + (j << blkbits),
- blk);
- if (ret)
- break;
- }
-
- if (ret) {
- WARN_ON_ONCE(1);
- SetPageError(page);
- } else {
- SetPageUptodate(page);
- }
- unlock_page(page);
- }
- fscrypt_release_ctx(ctx);
- bio_put(bio);
-}
-
bool fscrypt_bio_encrypted(struct bio *bio)
{
if (bio->bi_vcnt) {
@@ -85,8 +41,8 @@ bool fscrypt_bio_encrypted(struct bio *bio)
void fscrypt_decrypt_bio_blocks(struct fscrypt_ctx *ctx, struct bio *bio,
void (*process_bio)(struct work_struct *))
{
- INIT_WORK(&ctx->r.work,
- process_bio ? process_bio : completion_pages);
+ BUG_ON(!process_bio);
+ INIT_WORK(&ctx->r.work, process_bio);
ctx->r.bio = bio;
queue_work(fscrypt_read_workqueue, &ctx->r.work);
}
diff --git a/fs/crypto/readpage.c b/fs/crypto/readpage.c
index 7372173..521c221 100644
--- a/fs/crypto/readpage.c
+++ b/fs/crypto/readpage.c
@@ -29,6 +29,50 @@
#include "fscrypt_private.h"
+/*
+ * Call fscrypt_decrypt_block on every single page, reusing the encryption
+ * context.
+ */
+static void fscrypt_complete_pages(struct work_struct *work)
+{
+ struct fscrypt_ctx *ctx =
+ container_of(work, struct fscrypt_ctx, r.work);
+ struct bio *bio = ctx->r.bio;
+ struct bio_vec *bv;
+ int i;
+
+ bio_for_each_segment_all(bv, bio, i) {
+ struct page *page = bv->bv_page;
+ struct inode *inode = page->mapping->host;
+ const unsigned long blocksize = inode->i_sb->s_blocksize;
+ const unsigned int blkbits = inode->i_blkbits;
+ u64 page_blk = page->index << (PAGE_SHIFT - blkbits);
+ u64 blk = page_blk + (bv->bv_offset >> blkbits);
+ int nr_blks = bv->bv_len >> blkbits;
+ int ret = 0;
+ int j;
+
+ for (j = 0; j < nr_blks; j++, blk++) {
+ ret = fscrypt_decrypt_block(page->mapping->host,
+ page, blocksize,
+ bv->bv_offset + (j << blkbits),
+ blk);
+ if (ret)
+ break;
+ }
+
+ if (ret) {
+ WARN_ON_ONCE(1);
+ SetPageError(page);
+ } else {
+ SetPageUptodate(page);
+ }
+ unlock_page(page);
+ }
+ fscrypt_release_ctx(ctx);
+ bio_put(bio);
+}
+
static void fscrypt_complete_block(struct work_struct *work)
{
struct fscrypt_ctx *ctx =
@@ -108,7 +152,8 @@ static void fscrypt_mpage_end_io(struct bio *bio)
if (bio->bi_status) {
fscrypt_release_ctx(bio->bi_private);
} else {
- fscrypt_decrypt_bio_blocks(bio->bi_private, bio, NULL);
+ fscrypt_decrypt_bio_blocks(bio->bi_private, bio,
+ fscrypt_complete_pages);
return;
}
}
--
2.9.5
