From 37cea25dbaed1e1ab842c31ab39926370dd67109 Mon Sep 17 00:00:00 2001
From: Dmitri Monakhov <dmonakhov@openvz.org>
Date: Fri, 28 Mar 2008 14:15:52 -0700
Subject: [PATCH] --- yaml --- r: 87894 b: refs/heads/master c:
 5b41e74ad1b0bf7bc51765ae74e5dc564afc3e48 h: refs/heads/master v: v3

---
 [refs]            |  2 +-
 trunk/fs/buffer.c | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 221c89bc6bc4..f60ed542113d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d4a788f15302877ff2cb08f22009e290a36a209
+refs/heads/master: 5b41e74ad1b0bf7bc51765ae74e5dc564afc3e48
diff --git a/trunk/fs/buffer.c b/trunk/fs/buffer.c
index 7ba58386beee..98196327ddf0 100644
--- a/trunk/fs/buffer.c
+++ b/trunk/fs/buffer.c
@@ -2564,14 +2564,13 @@ int nobh_write_end(struct file *file, struct address_space *mapping,
 	struct inode *inode = page->mapping->host;
 	struct buffer_head *head = fsdata;
 	struct buffer_head *bh;
+	BUG_ON(fsdata != NULL && page_has_buffers(page));
 
-	if (!PageMappedToDisk(page)) {
-		if (unlikely(copied < len) && !page_has_buffers(page))
-			attach_nobh_buffers(page, head);
-		if (page_has_buffers(page))
-			return generic_write_end(file, mapping, pos, len,
-						copied, page, fsdata);
-	}
+	if (unlikely(copied < len) && !page_has_buffers(page))
+		attach_nobh_buffers(page, head);
+	if (page_has_buffers(page))
+		return generic_write_end(file, mapping, pos, len,
+					copied, page, fsdata);
 
 	SetPageUptodate(page);
 	set_page_dirty(page);