diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-11-10 10:05:37 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-11-10 10:05:37 -0800 |
| commit | 52d1998d09af92d44ffce7454637dd3fd1afdc7d (patch) | |
| tree | 635fa3d3bc7233fb21153fcf84ee807c39e4b946 /fs | |
| parent | 8bff39bfdc30c9bd6e152eb88a0bd6dd35bdd760 (diff) | |
| parent | 92cfcd030e4b1de11a6b1edb0840e55c26332d31 (diff) | |
| download | linux-52d1998d09af92d44ffce7454637dd3fd1afdc7d.tar.gz linux-52d1998d09af92d44ffce7454637dd3fd1afdc7d.tar.bz2 linux-52d1998d09af92d44ffce7454637dd3fd1afdc7d.zip | |
Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt
Pull fscrypt fix from Eric Biggers:
"Fix a regression where a new WARN_ON() was reachable when using
FSCRYPT_POLICY_FLAG_IV_INO_LBLK_32 on ext4, causing xfstest
generic/602 to sometimes fail on ext4"
* tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt:
fscrypt: remove reachable WARN in fscrypt_setup_iv_ino_lblk_32_key()
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/crypto/keysetup.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/crypto/keysetup.c b/fs/crypto/keysetup.c index d3c3e5d9b41f..d595abb8ef90 100644 --- a/fs/crypto/keysetup.c +++ b/fs/crypto/keysetup.c @@ -269,9 +269,7 @@ unlock: * New inodes may not have an inode number assigned yet. * Hashing their inode number is delayed until later. */ - if (ci->ci_inode->i_ino == 0) - WARN_ON(!(ci->ci_inode->i_state & I_CREATING)); - else + if (ci->ci_inode->i_ino) fscrypt_hash_inode_number(ci, mk); return 0; } |