diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-05-11 11:48:48 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-05-11 11:48:48 -0700 |
| commit | ae4d972f07f97de9a368a33820a7fe38284498c2 (patch) | |
| tree | 1623f306d0ce384e259cf36f2cab84dffbc9dcc2 /fs/ext4/crypto.c | |
| parent | 24638027f19a0294d10dc9b49a2d21051030bc47 (diff) | |
| parent | 7e061af6db97a51e9c89bcef7c2317b13cc79699 (diff) | |
Merge "Merge branch 'android-4.4@9796ea8' into branch 'msm-4.4'"
Diffstat (limited to 'fs/ext4/crypto.c')
| -rw-r--r-- | fs/ext4/crypto.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/fs/ext4/crypto.c b/fs/ext4/crypto.c index 664f42c850b7..e14b1b8fceb0 100644 --- a/fs/ext4/crypto.c +++ b/fs/ext4/crypto.c @@ -497,11 +497,6 @@ static int ext4_d_revalidate(struct dentry *dentry, unsigned int flags) return 0; } ci = EXT4_I(d_inode(dir))->i_crypt_info; - if (ci && ci->ci_keyring_key && - (ci->ci_keyring_key->flags & ((1 << KEY_FLAG_INVALIDATED) | - (1 << KEY_FLAG_REVOKED) | - (1 << KEY_FLAG_DEAD)))) - ci = NULL; /* this should eventually be an flag in d_flags */ cached_with_key = dentry->d_fsdata != NULL; |