On Mon, Apr 10, 2023 at 03:39:57PM -0400, Sweet Tea Dorminy wrote: > @@ -391,13 +390,6 @@ static int fscrypt_setup_v2_file_key(struct fscrypt_info *ci, > if (err) > return err; > > - /* Derive a secret dirhash key for directories that need it. */ > - if (need_dirhash_key) { > - err = fscrypt_derive_dirhash_key(ci, mk); > - if (err) > - return err; > - } > - > return 0; > } Instead of: if (err) return err; return 0; Just do: return err; - Eric