Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d0a8710 authored by Eric Biggers's avatar Eric Biggers Committed by Jaegeuk Kim
Browse files

fscrypt: inline fscrypt_free_filename() 



fscrypt_free_filename() only needs to do a kfree() of crypto_buf.name,
which works well as an inline function.  We can skip setting the various
pointers to NULL, since no user cares about it (the name is always freed
just before it goes out of scope).

Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Reviewed-by: default avatarDavid Gstir <david@sigma-star.at>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 8f294e1b

fs/crypto/fname.c

+0 −9
Original line number Diff line number Diff line
@@ -453,12 +453,3 @@ errout: 
	return ret;

}

EXPORT_SYMBOL(fscrypt_setup_filename);
 


void fscrypt_free_filename(struct fscrypt_name *fname)

{

	kfree(fname->crypto_buf.name);

	fname->crypto_buf.name = NULL;

	fname->usr_fname = NULL;

	fname->disk_name.name = NULL;

}

EXPORT_SYMBOL(fscrypt_free_filename);

include/linux/fscrypt_supp.h

+6 −1
Original line number Diff line number Diff line
@@ -47,7 +47,12 @@ extern void fscrypt_put_encryption_info(struct inode *, struct fscrypt_info *); 
/* fname.c */

extern int fscrypt_setup_filename(struct inode *, const struct qstr *,

				int lookup, struct fscrypt_name *);

extern void fscrypt_free_filename(struct fscrypt_name *);



static inline void fscrypt_free_filename(struct fscrypt_name *fname)

{

	kfree(fname->crypto_buf.name);

}



extern u32 fscrypt_fname_encrypted_size(const struct inode *, u32);

extern int fscrypt_fname_alloc_buffer(const struct inode *, u32,

				struct fscrypt_str *);