From 63b0592d00bb67aa0ae9664128e4bdd716f1ae05 Mon Sep 17 00:00:00 2001
From: Tao Ma <tao.ma@oracle.com>
Date: Wed, 9 Jun 2010 16:48:59 +0800
Subject: [PATCH] --- yaml --- r: 212756 b: refs/heads/master c:
 95fa859a268fd7d9bae6f2d4d095e3f61100ac1b h: refs/heads/master v: v3

---
 [refs]                |  2 +-
 trunk/fs/ocfs2/file.c | 11 -----------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index a4997b0adf7e..73cabde8b7f9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c3f20c9813391ba4004764072989744395cf405
+refs/heads/master: 95fa859a268fd7d9bae6f2d4d095e3f61100ac1b
diff --git a/trunk/fs/ocfs2/file.c b/trunk/fs/ocfs2/file.c
index 9a03c151b5ce..4f9133f6368e 100644
--- a/trunk/fs/ocfs2/file.c
+++ b/trunk/fs/ocfs2/file.c
@@ -2312,17 +2312,6 @@ static ssize_t ocfs2_file_aio_write(struct kiocb *iocb,
 		written = generic_file_direct_write(iocb, iov, &nr_segs, *ppos,
 						    ppos, count, ocount);
 		if (written < 0) {
-			/*
-			 * direct write may have instantiated a few
-			 * blocks outside i_size. Trim these off again.
-			 * Don't need i_size_read because we hold i_mutex.
-			 *
-			 * XXX(truncate): this looks buggy because ocfs2 did not
-			 * actually implement ->truncate.  Take a look at
-			 * the new truncate sequence and update this accordingly
-			 */
-			if (*ppos + count > inode->i_size)
-				truncate_setsize(inode, inode->i_size);
 			ret = written;
 			goto out_dio;
 		}