Commit 60eac60b authored May 22, 2017 by Eric Biggers Committed by Jaegeuk Kim Jul 31, 2017

f2fs: don't bother checking for encryption key in ->write_iter()



commit aaebdee8b88225ebe28af2afc60446f9fd7228f9 upstream.

Since only an open file can be written to, and we only allow open()ing
an encrypted file when its key is available, there is no need to check
for the key again before permitting each ->write_iter().

This code was also broken in that it wouldn't actually have failed if
the key was in fact unavailable.

Signed-off-by: Eric Biggers <ebiggers@google.com>
Reviewed-by: David Gstir <david@sigma-star.at>
Acked-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

parent 9c751fd7

fs/f2fs/file.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -2336,11 +2336,6 @@ static ssize_t f2fs_file_write_iter(struct kiocb iocb, struct iov_iter from)
		struct blk_plug plug;
		ssize_t ret;

		if (f2fs_encrypted_inode(inode) &&
		!fscrypt_has_encryption_key(inode) &&
		fscrypt_get_encryption_info(inode))
		return -EACCES;

		inode_lock(inode);
		ret = generic_write_checks(file, &pos, &count, S_ISBLK(inode->i_mode));
		if (!ret) {