From b4b95ed8133a5f2557d2e1d4e947532b41dee1bf Mon Sep 17 00:00:00 2001
From: Marco Stornelli <marco.stornelli@gmail.com>
Date: Sat, 15 Dec 2012 11:51:11 +0100
Subject: [PATCH] --- yaml --- r: 347798 b: refs/heads/master c:
 62295183846234b423a67116c36e00bd29dfd856 h: refs/heads/master v: v3

---
 [refs]                |  2 +-
 trunk/fs/adfs/inode.c | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 7b52580263c3..2d2380b5e3a7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a6ff03771e9d4a2a64cd1414e32c6b369ae935ba
+refs/heads/master: 62295183846234b423a67116c36e00bd29dfd856
diff --git a/trunk/fs/adfs/inode.c b/trunk/fs/adfs/inode.c
index e9bad5093a3f..5f95d1ed9c6d 100644
--- a/trunk/fs/adfs/inode.c
+++ b/trunk/fs/adfs/inode.c
@@ -45,6 +45,14 @@ static int adfs_readpage(struct file *file, struct page *page)
 	return block_read_full_page(page, adfs_get_block);
 }
 
+static void adfs_write_failed(struct address_space *mapping, loff_t to)
+{
+	struct inode *inode = mapping->host;
+
+	if (to > inode->i_size)
+		truncate_pagecache(inode, to, inode->i_size);
+}
+
 static int adfs_write_begin(struct file *file, struct address_space *mapping,
 			loff_t pos, unsigned len, unsigned flags,
 			struct page **pagep, void **fsdata)
@@ -55,11 +63,8 @@ static int adfs_write_begin(struct file *file, struct address_space *mapping,
 	ret = cont_write_begin(file, mapping, pos, len, flags, pagep, fsdata,
 				adfs_get_block,
 				&ADFS_I(mapping->host)->mmu_private);
-	if (unlikely(ret)) {
-		loff_t isize = mapping->host->i_size;
-		if (pos + len > isize)
-			vmtruncate(mapping->host, isize);
-	}
+	if (unlikely(ret))
+		adfs_write_failed(mapping, pos + len);
 
 	return ret;
 }