From 997a2f5c2d83b15c6c5f22f379ba4377f939b390 Mon Sep 17 00:00:00 2001
From: Marco Stornelli <marco.stornelli@gmail.com>
Date: Sat, 15 Dec 2012 11:52:33 +0100
Subject: [PATCH] --- yaml --- r: 347800 b: refs/heads/master c:
 41ddaeeb9d02ca12fee80b4eb23ab388b3ebe69d h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index f46bcdd24bef..d82d2cef19c4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1dc1834f4292624f46da7e0309bc04a3cca1b07c
+refs/heads/master: 41ddaeeb9d02ca12fee80b4eb23ab388b3ebe69d
diff --git a/trunk/fs/bfs/file.c b/trunk/fs/bfs/file.c
index f20e8a71062f..ad3ea1497cc3 100644
--- a/trunk/fs/bfs/file.c
+++ b/trunk/fs/bfs/file.c
@@ -161,6 +161,14 @@ static int bfs_readpage(struct file *file, struct page *page)
 	return block_read_full_page(page, bfs_get_block);
 }
 
+static void bfs_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 bfs_write_begin(struct file *file, struct address_space *mapping,
 			loff_t pos, unsigned len, unsigned flags,
 			struct page **pagep, void **fsdata)
@@ -169,11 +177,8 @@ static int bfs_write_begin(struct file *file, struct address_space *mapping,
 
 	ret = block_write_begin(mapping, pos, len, flags, pagep,
 				bfs_get_block);
-	if (unlikely(ret)) {
-		loff_t isize = mapping->host->i_size;
-		if (pos + len > isize)
-			vmtruncate(mapping->host, isize);
-	}
+	if (unlikely(ret))
+		bfs_write_failed(mapping, pos + len);
 
 	return ret;
 }