Commit 8b10fe68 authored by Jeff Layton's avatar Jeff Layton Committed by Eric Biggers
Browse files

fscrypt: drop unused inode argument from fscrypt_fname_alloc_buffer 



Signed-off-by: default avatarJeff Layton <jlayton@kernel.org>
Link: https://lore.kernel.org/r/20200810142139.487631-1-jlayton@kernel.org


Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
parent f4d51dff

fs/crypto/fname.c

+1 −4
Original line number Diff line number Diff line
@@ -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);

fs/crypto/hooks.c

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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,7 +1015,7 @@ static int htree_dirblock_to_tree(struct file *dir_file, 
			brelse(bh);

			return err;

		}

		err = fscrypt_fname_alloc_buffer(dir, EXT4_NAME_LEN,

		err = fscrypt_fname_alloc_buffer(EXT4_NAME_LEN,

						 &fname_crypto_str);

		if (err < 0) {

			brelse(bh);

fs/f2fs/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}