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

Commit bfc4ee39 authored by Jens Axboe's avatar Jens Axboe Committed by Jens Axboe
Browse files

[PATCH] splice: fix unlocking of page on error ->prepare_write() 



Looking at generic_file_buffered_write(), we need to unlock_page() if
prepare write fails and it isn't due to racing with truncate().

Also trim the size if ->prepare_write() fails, if we have to.

Signed-off-by: default avatarJens Axboe <axboe@suse.de>
parent 5dea5176

fs/splice.c

+16 −3
Original line number Diff line number Diff line
@@ -647,11 +647,24 @@ static int pipe_to_file(struct pipe_inode_info *info, struct pipe_buffer *buf, 
	}



	ret = mapping->a_ops->prepare_write(file, page, offset, offset+this_len);

	if (ret == AOP_TRUNCATED_PAGE) {

	if (unlikely(ret)) {

		loff_t isize = i_size_read(mapping->host);



		if (ret != AOP_TRUNCATED_PAGE)

			unlock_page(page);

		page_cache_release(page);

		if (ret == AOP_TRUNCATED_PAGE)

			goto find_page;

	} else if (ret)



		/*

		 * prepare_write() may have instantiated a few blocks

		 * outside i_size.  Trim these off again.

		 */

		if (sd->pos + this_len > isize)

			vmtruncate(mapping->host, isize);



		goto out;

	}



	if (buf->page != page) {

		/*