From: Benoît Thébaudeau <benoit@wsystem.com>
Date: Mon, 28 Sep 2015 13:45:29 +0000 (+0200)
Subject: fs/fat/fat_write: Merge calls to set_cluster()
X-Git-Tag: v2015.10-rc5~19
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1d7f2ece69c9d80264321bc4ee07f57eec392538;p=u-boot

fs/fat/fat_write: Merge calls to set_cluster()

set_contents() had uselessly split calls to set_cluster(). Merge these
calls, which removes some cases of set_cluster() being called with a
size of zero.

Signed-off-by: Benoît Thébaudeau <benoit@wsystem.com>
---

diff --git a/fs/fat/fat_write.c b/fs/fat/fat_write.c
index d0d9df7170..e08cf83b05 100644
--- a/fs/fat/fat_write.c
+++ b/fs/fat/fat_write.c
@@ -728,21 +728,10 @@ set_contents(fsdata *mydata, dir_entry *dentptr, __u8 *buffer,
 			endclust = newclust;
 			actsize += bytesperclust;
 		}
-		/* actsize >= file size */
-		actsize -= bytesperclust;
-		/* set remaining clusters */
-		if (set_cluster(mydata, curclust, buffer, (int)actsize) != 0) {
-			debug("error: writing cluster\n");
-			return -1;
-		}
 
 		/* set remaining bytes */
-		*gotsize += actsize;
-		filesize -= actsize;
-		buffer += actsize;
 		actsize = filesize;
-
-		if (set_cluster(mydata, endclust, buffer, (int)actsize) != 0) {
+		if (set_cluster(mydata, curclust, buffer, (int)actsize) != 0) {
 			debug("error: writing cluster\n");
 			return -1;
 		}