---

yaml
---
r: 212756
b: refs/heads/master
c: 95fa859
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c3f20c9813391ba4004764072989744395cf405
+refs/heads/master: 95fa859a268fd7d9bae6f2d4d095e3f61100ac1b

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;
 		}