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>utp
parent
8133f43d1c
commit
1d7f2ece69
|
@ -728,21 +728,10 @@ set_contents(fsdata *mydata, dir_entry *dentptr, __u8 *buffer,
|
||||||
endclust = newclust;
|
endclust = newclust;
|
||||||
actsize += bytesperclust;
|
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 */
|
/* set remaining bytes */
|
||||||
*gotsize += actsize;
|
|
||||||
filesize -= actsize;
|
|
||||||
buffer += actsize;
|
|
||||||
actsize = filesize;
|
actsize = filesize;
|
||||||
|
if (set_cluster(mydata, curclust, buffer, (int)actsize) != 0) {
|
||||||
if (set_cluster(mydata, endclust, buffer, (int)actsize) != 0) {
|
|
||||||
debug("error: writing cluster\n");
|
debug("error: writing cluster\n");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue