aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ecryptfs/crypto.c
diff options
context:
space:
mode:
authorMichael Halcrow <mhalcrow@us.ibm.com>2009-01-06 17:42:02 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-06 18:59:22 -0500
commitdf261c52abdef147084c76ecf14473184e907547 (patch)
treef1f423ba612dbacace82193f2b088252f169a9c6 /fs/ecryptfs/crypto.c
parent87c94c4df0149786ad91d8a03c738a03369ee9c8 (diff)
eCryptfs: Replace %Z with %z
%Z is a gcc-ism. Using %z instead. Signed-off-by: Michael Halcrow <mhalcrow@us.ibm.com> Cc: Dustin Kirkland <dustin.kirkland@gmail.com> Cc: Eric Sandeen <sandeen@redhat.com> Cc: Tyler Hicks <tchicks@us.ibm.com> Cc: David Kleikamp <shaggy@us.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/ecryptfs/crypto.c')
-rw-r--r--fs/ecryptfs/crypto.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c
index ea2afd2ce222..490b129311eb 100644
--- a/fs/ecryptfs/crypto.c
+++ b/fs/ecryptfs/crypto.c
@@ -1679,7 +1679,7 @@ ecryptfs_encrypt_filename(struct ecryptfs_filename *filename,
1679 kmalloc(filename->encrypted_filename_size, GFP_KERNEL); 1679 kmalloc(filename->encrypted_filename_size, GFP_KERNEL);
1680 if (!filename->encrypted_filename) { 1680 if (!filename->encrypted_filename) {
1681 printk(KERN_ERR "%s: Out of memory whilst attempting " 1681 printk(KERN_ERR "%s: Out of memory whilst attempting "
1682 "to kmalloc [%Zd] bytes\n", __func__, 1682 "to kmalloc [%zd] bytes\n", __func__,
1683 filename->encrypted_filename_size); 1683 filename->encrypted_filename_size);
1684 rc = -ENOMEM; 1684 rc = -ENOMEM;
1685 goto out; 1685 goto out;
@@ -1752,7 +1752,7 @@ ecryptfs_process_key_cipher(struct crypto_blkcipher **key_tfm,
1752 *key_tfm = NULL; 1752 *key_tfm = NULL;
1753 if (*key_size > ECRYPTFS_MAX_KEY_BYTES) { 1753 if (*key_size > ECRYPTFS_MAX_KEY_BYTES) {
1754 rc = -EINVAL; 1754 rc = -EINVAL;
1755 printk(KERN_ERR "Requested key size is [%Zd] bytes; maximum " 1755 printk(KERN_ERR "Requested key size is [%zd] bytes; maximum "
1756 "allowable is [%d]\n", *key_size, ECRYPTFS_MAX_KEY_BYTES); 1756 "allowable is [%d]\n", *key_size, ECRYPTFS_MAX_KEY_BYTES);
1757 goto out; 1757 goto out;
1758 } 1758 }
@@ -1777,7 +1777,7 @@ ecryptfs_process_key_cipher(struct crypto_blkcipher **key_tfm,
1777 get_random_bytes(dummy_key, *key_size); 1777 get_random_bytes(dummy_key, *key_size);
1778 rc = crypto_blkcipher_setkey(*key_tfm, dummy_key, *key_size); 1778 rc = crypto_blkcipher_setkey(*key_tfm, dummy_key, *key_size);
1779 if (rc) { 1779 if (rc) {
1780 printk(KERN_ERR "Error attempting to set key of size [%Zd] for " 1780 printk(KERN_ERR "Error attempting to set key of size [%zd] for "
1781 "cipher [%s]; rc = [%d]\n", *key_size, cipher_name, rc); 1781 "cipher [%s]; rc = [%d]\n", *key_size, cipher_name, rc);
1782 rc = -EINVAL; 1782 rc = -EINVAL;
1783 goto out; 1783 goto out;
@@ -2221,7 +2221,7 @@ int ecryptfs_decode_and_decrypt_filename(char **plaintext_name,
2221 decoded_name = kmalloc(decoded_name_size, GFP_KERNEL); 2221 decoded_name = kmalloc(decoded_name_size, GFP_KERNEL);
2222 if (!decoded_name) { 2222 if (!decoded_name) {
2223 printk(KERN_ERR "%s: Out of memory whilst attempting " 2223 printk(KERN_ERR "%s: Out of memory whilst attempting "
2224 "to kmalloc [%Zd] bytes\n", __func__, 2224 "to kmalloc [%zd] bytes\n", __func__,
2225 decoded_name_size); 2225 decoded_name_size);
2226 rc = -ENOMEM; 2226 rc = -ENOMEM;
2227 goto out; 2227 goto out;