diff options
| author | Eric Biggers <ebiggers@google.com> | 2018-05-01 00:51:47 +0200 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2018-05-20 22:21:05 +0200 |
| commit | 544d08fde258b4da72b6cfbe2d7172c86ce9860d (patch) | |
| tree | 56d013a89974bd62e3ca974e090f495808edc64a /fs/crypto/fname.c | |
| parent | fscrypt: remove internal key size constants (diff) | |
| download | linux-544d08fde258b4da72b6cfbe2d7172c86ce9860d.tar.xz linux-544d08fde258b4da72b6cfbe2d7172c86ce9860d.zip | |
fscrypt: use a common logging function
Use a common function for fscrypt warning and error messages so that all
the messages are consistently ratelimited, include the "fscrypt:"
prefix, and include the filesystem name if applicable.
Also fix up a few of the log messages to be more descriptive.
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.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/fs/crypto/fname.c b/fs/crypto/fname.c index 39091fc31e98..d7a0f682ca12 100644 --- a/fs/crypto/fname.c +++ b/fs/crypto/fname.c @@ -71,8 +71,9 @@ int fname_encrypt(struct inode *inode, const struct qstr *iname, res = crypto_wait_req(crypto_skcipher_encrypt(req), &wait); skcipher_request_free(req); if (res < 0) { - printk_ratelimited(KERN_ERR - "%s: Error (error code %d)\n", __func__, res); + fscrypt_err(inode->i_sb, + "Filename encryption failed for inode %lu: %d", + inode->i_ino, res); return res; } @@ -115,8 +116,9 @@ static int fname_decrypt(struct inode *inode, res = crypto_wait_req(crypto_skcipher_decrypt(req), &wait); skcipher_request_free(req); if (res < 0) { - printk_ratelimited(KERN_ERR - "%s: Error (error code %d)\n", __func__, res); + fscrypt_err(inode->i_sb, + "Filename decryption failed for inode %lu: %d", + inode->i_ino, res); return res; } |