fscrypt: rename fscrypt_do_page_crypto() to fscrypt_crypt_block()

fscrypt_do_page_crypto() only does a single encryption or decryption
operation, with a single logical block number (single IV).  So it
actually operates on a filesystem block, not a "page" per se.  To
reflect this, rename it to fscrypt_crypt_block().

Reviewed-by: Chandan Rajendra <chandan@linux.ibm.com>
Signed-off-by: Eric Biggers <ebiggers@google.com>

diff --git a/fs/crypto/bio.c b/fs/crypto/bio.c
index c534253..92b2d5d 100644 (file)
--- a/fs/crypto/bio.c
+++ b/fs/crypto/bio.c
@@ -83,9 +83,9 @@ int fscrypt_zeroout_range(const struct inode *inode, pgoff_t lblk,
                return -ENOMEM;
 
        while (len--) {
-               err = fscrypt_do_page_crypto(inode, FS_ENCRYPT, lblk,
-                                            ZERO_PAGE(0), ciphertext_page,
-                                            PAGE_SIZE, 0, GFP_NOFS);
+               err = fscrypt_crypt_block(inode, FS_ENCRYPT, lblk,
+                                         ZERO_PAGE(0), ciphertext_page,
+                                         PAGE_SIZE, 0, GFP_NOFS);
                if (err)
                        goto errout;
 

diff --git a/fs/crypto/crypto.c b/fs/crypto/crypto.c
index 9dd7a64..a798c52 100644 (file)
--- a/fs/crypto/crypto.c
+++ b/fs/crypto/crypto.c
@@ -148,10 +148,11 @@ void fscrypt_generate_iv(union fscrypt_iv *iv, u64 lblk_num,
                crypto_cipher_encrypt_one(ci->ci_essiv_tfm, iv->raw, iv->raw);
 }
 
-int fscrypt_do_page_crypto(const struct inode *inode, fscrypt_direction_t rw,
-                          u64 lblk_num, struct page *src_page,
-                          struct page *dest_page, unsigned int len,
-                          unsigned int offs, gfp_t gfp_flags)
+/* Encrypt or decrypt a single filesystem block of file contents */
+int fscrypt_crypt_block(const struct inode *inode, fscrypt_direction_t rw,
+                       u64 lblk_num, struct page *src_page,
+                       struct page *dest_page, unsigned int len,
+                       unsigned int offs, gfp_t gfp_flags)
 {
        union fscrypt_iv iv;
        struct skcipher_request *req = NULL;
@@ -228,9 +229,9 @@ struct page *fscrypt_encrypt_page(const struct inode *inode,
 
        if (inode->i_sb->s_cop->flags & FS_CFLG_OWN_PAGES) {
                /* with inplace-encryption we just encrypt the page */
-               err = fscrypt_do_page_crypto(inode, FS_ENCRYPT, lblk_num, page,
-                                            ciphertext_page, len, offs,
-                                            gfp_flags);
+               err = fscrypt_crypt_block(inode, FS_ENCRYPT, lblk_num, page,
+                                         ciphertext_page, len, offs,
+                                         gfp_flags);
                if (err)
                        return ERR_PTR(err);
 
@@ -244,9 +245,8 @@ struct page *fscrypt_encrypt_page(const struct inode *inode,
        if (!ciphertext_page)
                return ERR_PTR(-ENOMEM);
 
-       err = fscrypt_do_page_crypto(inode, FS_ENCRYPT, lblk_num,
-                                    page, ciphertext_page, len, offs,
-                                    gfp_flags);
+       err = fscrypt_crypt_block(inode, FS_ENCRYPT, lblk_num, page,
+                                 ciphertext_page, len, offs, gfp_flags);
        if (err) {
                fscrypt_free_bounce_page(ciphertext_page);
                return ERR_PTR(err);
@@ -278,8 +278,8 @@ int fscrypt_decrypt_page(const struct inode *inode, struct page *page,
        if (!(inode->i_sb->s_cop->flags & FS_CFLG_OWN_PAGES))
                BUG_ON(!PageLocked(page));
 
-       return fscrypt_do_page_crypto(inode, FS_DECRYPT, lblk_num, page, page,
-                                     len, offs, GFP_NOFS);
+       return fscrypt_crypt_block(inode, FS_DECRYPT, lblk_num, page, page,
+                                  len, offs, GFP_NOFS);
 }
 EXPORT_SYMBOL(fscrypt_decrypt_page);
 

diff --git a/fs/crypto/fscrypt_private.h b/fs/crypto/fscrypt_private.h
index 4122ee1..8978eec 100644 (file)
--- a/fs/crypto/fscrypt_private.h
+++ b/fs/crypto/fscrypt_private.h
@@ -116,12 +116,11 @@ static inline bool fscrypt_valid_enc_modes(u32 contents_mode,
 /* crypto.c */
 extern struct kmem_cache *fscrypt_info_cachep;
 extern int fscrypt_initialize(unsigned int cop_flags);
-extern int fscrypt_do_page_crypto(const struct inode *inode,
-                                 fscrypt_direction_t rw, u64 lblk_num,
-                                 struct page *src_page,
-                                 struct page *dest_page,
-                                 unsigned int len, unsigned int offs,
-                                 gfp_t gfp_flags);
+extern int fscrypt_crypt_block(const struct inode *inode,
+                              fscrypt_direction_t rw, u64 lblk_num,
+                              struct page *src_page, struct page *dest_page,
+                              unsigned int len, unsigned int offs,
+                              gfp_t gfp_flags);
 extern struct page *fscrypt_alloc_bounce_page(gfp_t gfp_flags);
 extern const struct dentry_operations fscrypt_d_ops;