From: Tao Ma <tao.ma@oracle.com>
Date: Wed, 9 Jun 2010 08:48:59 +0000 (+0800)
Subject: ocfs2: Remove obscure error handling in direct_write.
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=95fa859a268fd7d9bae6f2d4d095e3f61100ac1b;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

ocfs2: Remove obscure error handling in direct_write.

In ocfs2, actually we don't allow any direct write pass i_size,
see the function ocfs2_prepare_inode_for_write. So we don't
need the bogus simple_setsize.

Signed-off-by: Tao Ma <tao.ma@oracle.com>
Signed-off-by: Joel Becker <joel.becker@oracle.com>
---

diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index 9a03c151b5c..4f9133f6368 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -2312,17 +2312,6 @@ relock:
 		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;
 		}