From: Jens Axboe <axboe@suse.de>
Date: Wed, 3 May 2006 08:35:10 +0000 (+0200)
Subject: [PATCH] splice: fix unlocking of page on error ->prepare_write()
X-Git-Tag: v2.6.17-rc4~44^2~4
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=bfc4ee39fdbb2deb8864785d5e5bc5cdd3b31a69;p=linux-2.6-omap-h63xx.git

[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: Jens Axboe <axboe@suse.de>
---

diff --git a/fs/splice.c b/fs/splice.c
index 7fb04970c72..27f5e3738a7 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -647,11 +647,24 @@ find_page:
 	}
 
 	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);
-		goto find_page;
-	} else if (ret)
+		if (ret == AOP_TRUNCATED_PAGE)
+			goto find_page;
+
+		/*
+		 * 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) {
 		/*