diff options
| author | Eric Biggers <ebiggers@google.com> | 2018-01-11 23:30:13 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2018-01-11 23:30:13 -0500 |
| commit | 3d204e24d452f96704f5feb83f6b7654245defc9 (patch) | |
| tree | 680d6fad2a6f7a7d6638e828b8ea2542beea4509 /fs/ubifs | |
| parent | 2f46a2bc2694877332f9c1ff47acb7fa117e168a (diff) | |
| download | op-kernel-dev-3d204e24d452f96704f5feb83f6b7654245defc9.zip op-kernel-dev-3d204e24d452f96704f5feb83f6b7654245defc9.tar.gz | |
fscrypt: remove 'ci' parameter from fscrypt_put_encryption_info()
fscrypt_put_encryption_info() is only called when evicting an inode, so
the 'struct fscrypt_info *ci' parameter is always NULL, and there cannot
be races with other threads. This was cruft left over from the broken
key revocation code. Remove the unused parameter and the cmpxchg().
Also remove the #ifdefs around the fscrypt_put_encryption_info() calls,
since fscrypt_notsupp.h defines a no-op stub for it.
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/ubifs')
| -rw-r--r-- | fs/ubifs/super.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c index 0beb285..b16ef16 100644 --- a/fs/ubifs/super.c +++ b/fs/ubifs/super.c @@ -379,9 +379,7 @@ out: } done: clear_inode(inode); -#ifdef CONFIG_UBIFS_FS_ENCRYPTION - fscrypt_put_encryption_info(inode, NULL); -#endif + fscrypt_put_encryption_info(inode); } static void ubifs_dirty_inode(struct inode *inode, int flags) |
