fscrypt: drop unused inode argument from fscrypt_fname_alloc_buffer
Subsystems (4)
PATCH 1/1 fscrypt: drop unused inode argument from fscrypt_fname_alloc_buffer
Signed-off-by Jeff Layton <[email protected]>
--- fs/crypto/fname.c | 5 +---- fs/crypto/hooks.c | 2 +- fs/ext4/dir.c | 2 +- fs/ext4/namei.c | 7 +++---- fs/f2fs/dir.c | 2 +- fs/ubifs/dir.c | 2 +- include/linux/fscrypt.h | 5 ++--- 7 files changed, 10 insertions(+), 15 deletions(-)
fs/crypto/fname.c +1 -4
@@ -277,8 +277,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
@@ -288,8 +286,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 );
fs/crypto/hooks.c +1 -1
@@ -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);
fs/ext4/dir.c +1 -1
@@ -148,7 +148,7 @@ static int ext4_readdir(struct file *file, struct dir_context *ctx) }if (IS_ENCRYPTED (inode)) { - err =fscrypt_fname_alloc_buffer (inode,EXT4_NAME_LEN , &fstr); + err =fscrypt_fname_alloc_buffer (EXT4_NAME_LEN , &fstr);if (err <0 )return err; }
fs/ext4/namei.c +3 -4
@@ -663,8 +663,7 @@ static struct stats dx_show_leaf(struct inode *dir,/* Directory is encrypted */ res =fscrypt_fname_alloc_buffer ( - dir, len, - &fname_crypto_str); + len, &fname_crypto_str);if (res)printk (KERN_WARNING "Error " "allocating crypto "
@@ -1016,8 +1015,8 @@ static int htree_dirblock_to_tree(struct file *dir_file,brelse (bh);return err; } - err =fscrypt_fname_alloc_buffer (dir,EXT4_NAME_LEN , - &fname_crypto_str); + err =fscrypt_fname_alloc_buffer (EXT4_NAME_LEN , + &fname_crypto_str);if (err <0 ) {brelse (bh);return err;
fs/f2fs/dir.c +1 -1
@@ -1032,7 +1032,7 @@ static int f2fs_readdir(struct file *file, struct dir_context *ctx)if (err) goto out; - err =fscrypt_fname_alloc_buffer (inode,F2FS_NAME_LEN , &fstr); + err =fscrypt_fname_alloc_buffer (F2FS_NAME_LEN , &fstr);if (err <0 ) goto out; }
fs/ubifs/dir.c +1 -1
@@ -515,7 +515,7 @@ static int ubifs_readdir(struct file *file, struct dir_context *ctx)if (err)return err; - err =fscrypt_fname_alloc_buffer (dir,UBIFS_MAX_NLEN , &fstr); + err =fscrypt_fname_alloc_buffer (UBIFS_MAX_NLEN , &fstr);if (err)return err;
include/linux/fscrypt.h +2 -3
@@ -189,7 +189,7 @@ static inline void fscrypt_free_filename(struct fscrypt_name *fname)kfree (fname->crypto_buf.name); } -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);void fscrypt_fname_free_buffer (struct fscrypt_str *crypto_str); int fscrypt_fname_disk_to_usr(const struct inode *inode,
@@ -420,8 +420,7 @@ static inline void fscrypt_free_filename(struct fscrypt_name *fname)return ; } -static inline int fscrypt_fname_alloc_buffer (const struct inode *inode, -u32 max_encrypted_len, +static inline int fscrypt_fname_alloc_buffer (u32 max_encrypted_len,struct fscrypt_str *crypto_str) {return -EOPNOTSUPP ;
Signature · 1 line
2.26.2
Quoted 11 lines · Jeff Layton
Signed-off-by Jeff Layton <[email protected]>--- fs/crypto/fname.c | 5 +---- fs/crypto/hooks.c | 2 +- fs/ext4/dir.c | 2 +- fs/ext4/namei.c | 7 +++---- fs/f2fs/dir.c | 2 +- fs/ubifs/dir.c | 2 +- include/linux/fscrypt.h | 5 ++--- 7 files changed, 10 insertions(+), 15 deletions(-)
Applied to fscrypt.git#master for 5.10. Thanks!
- Eric