Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42dc2a7b authored by Jaegeuk Kim's avatar Jaegeuk Kim Committed by Greg Kroah-Hartman
Browse files

f2fs: truncate preallocated blocks in error case 



commit dc7a10dd upstream.

If write is failed, we must deallocate the blocks that we couldn't write.

Cc: stable@vger.kernel.org
Reviewed-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: default avatarSudip Mukherjee <sudipm.mukherjee@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a2c7493c

fs/f2fs/file.c

+9 −0
Original line number Diff line number Diff line
@@ -2694,11 +2694,16 @@ static ssize_t f2fs_file_write_iter(struct kiocb *iocb, struct iov_iter *from) 
	inode_lock(inode);

	ret = generic_write_checks(iocb, from);

	if (ret > 0) {

		bool preallocated = false;

		size_t target_size = 0;

		int err;



		if (iov_iter_fault_in_readable(from, iov_iter_count(from)))

			set_inode_flag(inode, FI_NO_PREALLOC);



		preallocated = true;

		target_size = iocb->ki_pos + iov_iter_count(from);



		err = f2fs_preallocate_blocks(iocb, from);

		if (err) {

			clear_inode_flag(inode, FI_NO_PREALLOC);
@@ -2710,6 +2715,10 @@ static ssize_t f2fs_file_write_iter(struct kiocb *iocb, struct iov_iter *from) 
		blk_finish_plug(&plug);

		clear_inode_flag(inode, FI_NO_PREALLOC);



		/* if we couldn't write data, we should deallocate blocks. */

		if (preallocated && i_size_read(inode) < target_size)

			f2fs_truncate(inode);



		if (ret > 0)

			f2fs_update_iostat(F2FS_I_SB(inode), APP_WRITE_IO, ret);

	}