diff mbox

[U-Boot,2/5] fs/fat/fat_write: Merge calls to set_cluster()

Message ID 1443447932-14139-2-git-send-email-benoit@wsystem.com
State Accepted
Delegated to: Tom Rini
Headers show

Commit Message

Benoît Thébaudeau Sept. 28, 2015, 1:45 p.m. UTC 
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>
---
 fs/fat/fat_write.c | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

Comments

Tom Rini Oct. 12, 2015, 3:15 p.m. UTC | #1 
On Mon, Sep 28, 2015 at 03:45:29PM +0200, Benoît Thébaudeau wrote:

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

Applied to u-boot/master, thanks!
diff mbox

Patch

diff --git a/fs/fat/fat_write.c b/fs/fat/fat_write.c
index d0d9df7..e08cf83 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;
 		}