From: Theodore Ts'o <tytso@mit.edu>
Date: Mon, 1 Jul 2013 12:12:39 +0000 (-0400)
Subject: ext4: check error return from ext4_write_inline_data_end()
X-Git-Tag: upstream/snapshot3+hdmi~4666^2~18
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=42c832debbbf819f6c4ad8601baa559c44105ba4;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

ext4: check error return from ext4_write_inline_data_end()

The function ext4_write_inline_data_end() can return an error.  So we
need to assign it to a signed integer variable to check for an error
return (since copied is an unsigned int).

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: Zheng Liu <wenqing.lz@taobao.com>
Cc: stable@vger.kernel.org
---

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 6d051de..0994234 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -1061,10 +1061,13 @@ static int ext4_write_end(struct file *file,
 		}
 	}
 
-	if (ext4_has_inline_data(inode))
-		copied = ext4_write_inline_data_end(inode, pos, len,
-						    copied, page);
-	else
+	if (ext4_has_inline_data(inode)) {
+		ret = ext4_write_inline_data_end(inode, pos, len,
+						 copied, page);
+		if (ret < 0)
+			goto errout;
+		copied = ret;
+	} else
 		copied = block_write_end(file, mapping, pos,
 					 len, copied, page, fsdata);