On Mon, Apr 10, 2023 at 03:39:58PM -0400, Sweet Tea Dorminy wrote:
> +static int fscrypt_setup_ino_hash_key(struct fscrypt_master_key *mk)
> {
> int err;
>
> - err = find_mode_prepared_key(ci, mk, mk->mk_iv_ino_lblk_32_keys,
> - HKDF_CONTEXT_IV_INO_LBLK_32_KEY, true);
> - if (err)
> - return err;
> -
> /* pairs with smp_store_release() below */
> if (!smp_load_acquire(&mk->mk_ino_hash_key_initialized)) {
>
> @@ -335,12 +329,6 @@ static int fscrypt_setup_iv_ino_lblk_32_key(struct fscrypt_info *ci,
> return err;
> }
>
> - /*
> - * New inodes may not have an inode number assigned yet.
> - * Hashing their inode number is delayed until later.
> - */
> - if (ci->ci_inode->i_ino)
> - fscrypt_hash_inode_number(ci, mk);
> return 0;
> }
Now that this function just does one thing, maybe change it to use an early
return and remove a level of indentation?
if (smp_load_acquire(&mk->mk_ino_hash_key_initialized))
return 0;
- Eric
|