summaryrefslogtreecommitdiffstats
path: root/fs/crypto/fname.c
diff options
context:
space:
mode:
authorEric Biggers2016-09-15 22:51:01 +0200
committerTheodore Ts'o2016-09-15 22:51:01 +0200
commit53fd7550ec40571e26f730a0d3fc0a5dd93ecda2 (patch)
tree8c14bec1497c91ece2731e1c9629b4d445afb7a5 /fs/crypto/fname.c
parentfscrypto: remove unnecessary includes (diff)
downloadkernel-qcow2-linux-53fd7550ec40571e26f730a0d3fc0a5dd93ecda2.tar.gz
kernel-qcow2-linux-53fd7550ec40571e26f730a0d3fc0a5dd93ecda2.tar.xz
kernel-qcow2-linux-53fd7550ec40571e26f730a0d3fc0a5dd93ecda2.zip
fscrypto: rename completion callbacks to reflect usage
fscrypt_complete() was used only for data pages, not for all encryption/decryption. Rename it to page_crypt_complete(). dir_crypt_complete() was used for filename encryption/decryption for both directory entries and symbolic links. Rename it to fname_crypt_complete(). Signed-off-by: Eric Biggers <ebiggers@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/crypto/fname.c')
-rw-r--r--fs/crypto/fname.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/fs/crypto/fname.c b/fs/crypto/fname.c
index 31088061db17..6bbc3b1859e1 100644
--- a/fs/crypto/fname.c
+++ b/fs/crypto/fname.c
@@ -20,9 +20,11 @@ static u32 size_round_up(size_t size, size_t blksize)
}
/**
- * dir_crypt_complete() -
+ * fname_crypt_complete() - completion callback for filename crypto
+ * @req: The asynchronous cipher request context
+ * @res: The result of the cipher operation
*/
-static void dir_crypt_complete(struct crypto_async_request *req, int res)
+static void fname_crypt_complete(struct crypto_async_request *req, int res)
{
struct fscrypt_completion_result *ecr = req->data;
@@ -82,7 +84,7 @@ static int fname_encrypt(struct inode *inode,
}
skcipher_request_set_callback(req,
CRYPTO_TFM_REQ_MAY_BACKLOG | CRYPTO_TFM_REQ_MAY_SLEEP,
- dir_crypt_complete, &ecr);
+ fname_crypt_complete, &ecr);
/* Copy the input */
memcpy(workbuf, iname->name, iname->len);
@@ -144,7 +146,7 @@ static int fname_decrypt(struct inode *inode,
}
skcipher_request_set_callback(req,
CRYPTO_TFM_REQ_MAY_BACKLOG | CRYPTO_TFM_REQ_MAY_SLEEP,
- dir_crypt_complete, &ecr);
+ fname_crypt_complete, &ecr);
/* Initialize IV */
memset(iv, 0, FS_CRYPTO_BLOCK_SIZE);