diff options
| author | Eric Biggers | 2018-01-12 05:30:13 +0100 |
|---|---|---|
| committer | Theodore Ts'o | 2018-01-12 05:30:13 +0100 |
| commit | 3d204e24d452f96704f5feb83f6b7654245defc9 (patch) | |
| tree | 680d6fad2a6f7a7d6638e828b8ea2542beea4509 /fs/f2fs/inode.c | |
| parent | fscrypt: document symlink length restriction (diff) | |
| download | kernel-qcow2-linux-3d204e24d452f96704f5feb83f6b7654245defc9.tar.gz kernel-qcow2-linux-3d204e24d452f96704f5feb83f6b7654245defc9.tar.xz kernel-qcow2-linux-3d204e24d452f96704f5feb83f6b7654245defc9.zip | |
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/f2fs/inode.c')
| -rw-r--r-- | fs/f2fs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c index b4c4f2b25304..22a5607a0518 100644 --- a/fs/f2fs/inode.c +++ b/fs/f2fs/inode.c @@ -569,7 +569,7 @@ no_delete: !exist_written_data(sbi, inode->i_ino, ORPHAN_INO)); } out_clear: - fscrypt_put_encryption_info(inode, NULL); + fscrypt_put_encryption_info(inode); clear_inode(inode); } |