opengnsys
/
ntfs-3g
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoided an unnecessary runlist update when appending data to a file 

Appending data to a file is done in two steps : first extending the
file to the required size, then inserting data in the created space.
There is no need to recompute the runlist at the end of the first
step, just be sure the original configuration is rolled back if inserting
data leads to an error.
edge.strict_endians
Jean-Pierre André 2012-08-20 13:48:49 +02:00
parent ba3cb2c88b
commit 35eab4044e
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libntfs-3g/attrib.c
View File

@ -1849,6 +1849,13 @@ s64 ntfs_attr_pwrite(ntfs_attr *na, const s64 pos, s64 count, const void *b)
ntfs_log_perror("Failed to enlarge attribute");
goto errno_set;
}
/*
* If we avoided updating the runlist, we must be sure
* to cancel the enlargement and put back the runlist to
* a clean state if we get into some error.
*/
if (NAttrDataAppending(na))
need_to.undo_data_size = 1;
#else
if (ntfs_attr_truncate_i(na, pos + count, HOLES_OK)) {
ntfs_log_perror("Failed to enlarge attribute");
@ -6232,10 +6239,18 @@ static int ntfs_non_resident_attr_expand_i(ntfs_attr *na, const s64 newsize,
/* Prepare to mapping pairs update. */
na->allocated_size = first_free_vcn << vol->cluster_size_bits;
/* Write mapping pairs for new runlist. */
#if PARTIAL_RUNLIST_UPDATING
if (ntfs_attr_update_mapping_pairs_i(na, start_update, holes)) {
/*
* Write mapping pairs for new runlist, unless this is
* a temporary state before appending data.
* If the update is not done, we must be sure to do
* it later, and to get to a clean state even on errors.
*/
if ((holes != HOLES_DELAY)
&& ntfs_attr_update_mapping_pairs_i(na, start_update,
holes)) {
#else
/* Write mapping pairs for new runlist. */
if (ntfs_attr_update_mapping_pairs(na, 0)) {
#endif
err = errno;