[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs dir.c,1.52,1.53

[Szabolcs S. <sz...@us...>]

Changes by: szaka

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

Modified Files:
	dir.c 
Log Message:
__ntfs_create(): fix cluster leaks for some special files when index entry 
creation fails


Index: dir.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/dir.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- dir.c	30 Jan 2006 22:10:31 -0000	1.52
+++ dir.c	9 Feb 2006 21:43:52 -0000	1.53
@@ -1110,6 +1110,8 @@ static ntfs_inode *__ntfs_create(ntfs_in
 		ntfschar *target, u8 target_len)
 {
 	ntfs_inode *ni;
+	ntfs_attr *na;
+	int rollback_data = 0;
 	FILE_NAME_ATTR *fn = NULL;
 	STANDARD_INFORMATION *si = NULL;
 	int err, fn_len, si_len;
@@ -1244,8 +1246,8 @@ static ntfs_inode *__ntfs_create(ntfs_in
 			ntfs_log_error("Failed to add DATA attribute.\n");
 			goto err_out;
 		}
-		if (data)
-			free(data);
+		rollback_data = 1;
+		free(data);
 	}
 	/* Create FILE_NAME attribute. */
 	fn_len = sizeof(FILE_NAME_ATTR) + name_len * sizeof(ntfschar);
@@ -1293,6 +1295,17 @@ static ntfs_inode *__ntfs_create(ntfs_in
 	return ni;
 err_out:
 	ntfs_log_trace("Failed.\n");
+	if (rollback_data) {
+		na = ntfs_attr_open(ni, AT_DATA, AT_UNNAMED, 0);
+		if (!na)
+			ntfs_log_perror("Failed to open data attribute of "
+					" inode 0x%llx. Run chkdsk.\n",
+					(unsigned long long)ni->mft_no);
+		else if (ntfs_attr_rm(na))
+			ntfs_log_perror("Failed to remove data attribute of "
+					"inode 0x%llx. Run chkdsk.\n",
+					(unsigned long long)ni->mft_no);
+	}
 	if (ntfs_mft_record_free(ni->vol, ni))
 		ntfs_log_error("Failed to free MFT record.  "
 				"Leaving inconsistent metadata. Run chkdsk.\n");