diff options
| author | Eric Biggers <ebiggers@google.com> | 2019-07-24 20:07:58 +0200 |
|---|---|---|
| committer | Eric Biggers <ebiggers@google.com> | 2019-08-13 04:04:44 +0200 |
| commit | 886da8b39cf27995836062bb7fe5fd5cb764540a (patch) | |
| tree | e6c29f00bbad95d27698e199951a8e0d8d2a7245 /fs/crypto/fname.c | |
| parent | fscrypt: clean up base64 encoding/decoding (diff) | |
| download | linux-886da8b39cf27995836062bb7fe5fd5cb764540a.tar.xz linux-886da8b39cf27995836062bb7fe5fd5cb764540a.zip | |
fscrypt: make fscrypt_msg() take inode instead of super_block
Most of the warning and error messages in fs/crypto/ are for situations
related to a specific inode, not merely to a super_block. So to make
things easier, make fscrypt_msg() take an inode rather than a
super_block, and make it print the inode number.
Note: This is the same approach I'm taking for fsverity_msg().
Signed-off-by: Eric Biggers <ebiggers@google.com>
Diffstat (limited to 'fs/crypto/fname.c')
| -rw-r--r-- | fs/crypto/fname.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/fs/crypto/fname.c b/fs/crypto/fname.c index 6f9daba99168..5cab3bb2d1fc 100644 --- a/fs/crypto/fname.c +++ b/fs/crypto/fname.c @@ -71,9 +71,7 @@ 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) { - fscrypt_err(inode->i_sb, - "Filename encryption failed for inode %lu: %d", - inode->i_ino, res); + fscrypt_err(inode, "Filename encryption failed: %d", res); return res; } @@ -117,9 +115,7 @@ static int fname_decrypt(struct inode *inode, res = crypto_wait_req(crypto_skcipher_decrypt(req), &wait); skcipher_request_free(req); if (res < 0) { - fscrypt_err(inode->i_sb, - "Filename decryption failed for inode %lu: %d", - inode->i_ino, res); + fscrypt_err(inode, "Filename decryption failed: %d", res); return res; } |