diff options
| author |   Jeff Layton <jlayton@kernel.org> | 2020-08-10 10:21:39 -0400 |
|---|---|---|
| committer |   Eric Biggers <ebiggers@google.com> | 2020-09-07 15:27:42 -0700 |
| commit | 8b10fe68985278de4926daa56ad6af701839e40a (patch) | |
| tree | 06431d851fe27d4d4bbd432be53c71804f9daac7 /fs/crypto | |
| parent | Linux 5.9-rc4 (diff) | |
| download | linux-dev-8b10fe68985278de4926daa56ad6af701839e40a.tar.xz linux-dev-8b10fe68985278de4926daa56ad6af701839e40a.zip | |
fscrypt: drop unused inode argument from fscrypt_fname_alloc_buffer
Signed-off-by: Jeff Layton <jlayton@kernel.org>
Link: https://lore.kernel.org/r/20200810142139.487631-1-jlayton@kernel.org
Signed-off-by: Eric Biggers <ebiggers@google.com>
Diffstat (limited to 'fs/crypto')
| -rw-r--r-- | fs/crypto/fname.c | 5 | ||||
| -rw-r--r-- | fs/crypto/hooks.c | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/fs/crypto/fname.c b/fs/crypto/fname.c index 011830f84d8d..47bcfddb278b 100644 --- a/fs/crypto/fname.c +++ b/fs/crypto/fname.c @@ -260,8 +260,6 @@ bool fscrypt_fname_encrypted_size(const struct inode *inode, u32 orig_len, /** * fscrypt_fname_alloc_buffer() - allocate a buffer for presented filenames - * @inode: inode of the parent directory (for regular filenames) - * or of the symlink (for symlink targets) * @max_encrypted_len: maximum length of encrypted filenames the buffer will be * used to present * @crypto_str: (output) buffer to allocate @@ -271,8 +269,7 @@ bool fscrypt_fname_encrypted_size(const struct inode *inode, u32 orig_len, * * Return: 0 on success, -errno on failure */ -int fscrypt_fname_alloc_buffer(const struct inode *inode, - u32 max_encrypted_len, +int fscrypt_fname_alloc_buffer(u32 max_encrypted_len, struct fscrypt_str *crypto_str) { const u32 max_encoded_len = BASE64_CHARS(FSCRYPT_NOKEY_NAME_MAX); diff --git a/fs/crypto/hooks.c b/fs/crypto/hooks.c index 09fb8aa0f2e9..491b252843eb 100644 --- a/fs/crypto/hooks.c +++ b/fs/crypto/hooks.c @@ -319,7 +319,7 @@ const char *fscrypt_get_symlink(struct inode *inode, const void *caddr, if (cstr.len + sizeof(*sd) - 1 > max_size) return ERR_PTR(-EUCLEAN); - err = fscrypt_fname_alloc_buffer(inode, cstr.len, &pstr); + err = fscrypt_fname_alloc_buffer(cstr.len, &pstr); if (err) return ERR_PTR(err); |