From: Randy Dunlap Fix printk format warnings in ecryptfs: fs/ecryptfs/main.c:327: warning: format '%d' expects type 'int', but argument 3 has type 'size_t' fs/ecryptfs/crypto.c:1599: warning: format '%d' expects type 'int', but argument 2 has type 'size_t' fs/ecryptfs/crypto.c:1621: warning: format '%d' expects type 'int', but argument 2 has type 'size_t' fs/ecryptfs/crypto.c:1628: warning: format '%d' expects type 'int', but argument 2 has type 'size_t' fs/ecryptfs/crypto.c:1635: warning: format '%d' expects type 'int', but argument 2 has type 'size_t' fs/ecryptfs/crypto.c:1642: warning: format '%d' expects type 'int', but argument 2 has type 'size_t' fs/ecryptfs/crypto.c:1649: warning: format '%d' expects type 'int', but argument 2 has type 'size_t' fs/ecryptfs/crypto.c:1656: warning: format '%d' expects type 'int', but argument 2 has type 'size_t' Signed-off-by: Randy Dunlap Cc: Michael Halcrow Signed-off-by: Andrew Morton --- fs/ecryptfs/crypto.c | 14 +++++++------- fs/ecryptfs/main.c | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff -puN fs/ecryptfs/crypto.c~ecryptfs-fix-printk-format-warnings fs/ecryptfs/crypto.c --- a/fs/ecryptfs/crypto.c~ecryptfs-fix-printk-format-warnings +++ a/fs/ecryptfs/crypto.c @@ -1595,7 +1595,7 @@ ecryptfs_process_cipher(struct crypto_tf *tfm = *key_tfm = NULL; if (key_size > ECRYPTFS_MAX_KEY_BYTES) { rc = -EINVAL; - printk(KERN_ERR "Requested key size is [%d] bytes; maximum " + printk(KERN_ERR "Requested key size is [%Zd] bytes; maximum " "allowable is [%d]\n", key_size, ECRYPTFS_MAX_KEY_BYTES); goto out; } @@ -1616,28 +1616,28 @@ ecryptfs_process_cipher(struct crypto_tf } if (key_size < crypto_tfm_alg_min_keysize(*tfm)) { rc = -EINVAL; - printk(KERN_ERR "Request key size is [%d]; minimum key size " + printk(KERN_ERR "Request key size is [%Zd]; minimum key size " "supported by cipher [%s] is [%d]\n", key_size, cipher_name, crypto_tfm_alg_min_keysize(*tfm)); goto out; } if (key_size < crypto_tfm_alg_min_keysize(*key_tfm)) { rc = -EINVAL; - printk(KERN_ERR "Request key size is [%d]; minimum key size " + printk(KERN_ERR "Request key size is [%Zd]; minimum key size " "supported by cipher [%s] is [%d]\n", key_size, cipher_name, crypto_tfm_alg_min_keysize(*key_tfm)); goto out; } if (key_size > crypto_tfm_alg_max_keysize(*tfm)) { rc = -EINVAL; - printk(KERN_ERR "Request key size is [%d]; maximum key size " + printk(KERN_ERR "Request key size is [%Zd]; maximum key size " "supported by cipher [%s] is [%d]\n", key_size, cipher_name, crypto_tfm_alg_min_keysize(*tfm)); goto out; } if (key_size > crypto_tfm_alg_max_keysize(*key_tfm)) { rc = -EINVAL; - printk(KERN_ERR "Request key size is [%d]; maximum key size " + printk(KERN_ERR "Request key size is [%Zd]; maximum key size " "supported by cipher [%s] is [%d]\n", key_size, cipher_name, crypto_tfm_alg_min_keysize(*key_tfm)); goto out; @@ -1645,14 +1645,14 @@ ecryptfs_process_cipher(struct crypto_tf get_random_bytes(dummy_key, key_size); rc = crypto_cipher_setkey(*tfm, dummy_key, key_size); if (rc) { - printk(KERN_ERR "Error attempting to set key of size [%d] for " + printk(KERN_ERR "Error attempting to set key of size [%Zd] for " "cipher [%s]; rc = [%d]\n", key_size, cipher_name, rc); rc = -EINVAL; goto out; } rc = crypto_cipher_setkey(*key_tfm, dummy_key, key_size); if (rc) { - printk(KERN_ERR "Error attempting to set key of size [%d] for " + printk(KERN_ERR "Error attempting to set key of size [%Zd] for " "cipher [%s]; rc = [%d]\n", key_size, cipher_name, rc); rc = -EINVAL; goto out; diff -puN fs/ecryptfs/main.c~ecryptfs-fix-printk-format-warnings fs/ecryptfs/main.c --- a/fs/ecryptfs/main.c~ecryptfs-fix-printk-format-warnings +++ a/fs/ecryptfs/main.c @@ -322,7 +322,7 @@ static int ecryptfs_parse_options(struct crypto_free_tfm(tmp_tfm); if (rc) { printk(KERN_ERR "Error attempting to initialize cipher [%s] " - "with key size [%d] bytes; rc = [%d]\n", + "with key size [%Zd] bytes; rc = [%d]\n", mount_crypt_stat->global_default_cipher_name, mount_crypt_stat->global_default_cipher_key_size, rc); rc = -EINVAL; _