[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsrm.c,1.45,1.46

[Richard R. <fl...@us...>]

Changes by: flatcap

Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10357

Modified Files:
	ntfsrm.c 
Log Message:
fix careless mst write
move truncate out of the commit path

Index: ntfsrm.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsrm.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- ntfsrm.c	18 Jul 2005 23:53:14 -0000	1.45
+++ ntfsrm.c	19 Jul 2005 01:56:41 -0000	1.46
@@ -1157,7 +1157,7 @@ static int ntfs_dt_commit (struct ntfs_d
 			size = dt->dir->index_size;
 			//utils_dump_mem (dt->data, 0, size, DM_DEFAULTS);
 #ifdef RM_WRITE
-			ntfs_attr_mst_pwrite(attr, dt->vcn * size, 1, size, dt->data); // XXX retval
+			ntfs_attr_mst_pwrite(attr, dt->vcn * vol->cluster_size, 1, size, dt->data); // XXX retval
 #endif
 		} else {
 			printf ("commit dt (root)\n");
@@ -3355,8 +3355,6 @@ static int ntfs_dir_commit (struct ntfs_
 		printf (RED "\tntfs_inode_sync %llu\n" END, dir->inode->mft_no);
 	}
 
-	ntfs_dir_truncate (dir->vol, dir);
-
 	if (ntfs_dt_commit (dir->index) < 0)
 		return -1;
 
@@ -4268,7 +4266,8 @@ static int ntfs_file_remove2 (ntfs_volum
 
 	if (1) ntfs_file_remove (vol, dt, dt_num); // remove name from index
 
-	if (1) utils_volume_commit (vol);
+	if (1) ntfs_dir_truncate (vol, dt->dir);
+
 	if (1) utils_volume_commit (vol);
 
 	if (0) utils_volume_rollback (vol);