linux-ntfs-cvs — List for CVS checkins and comments.

[Linux-NTFS-cvs] CVS: ntfsprogs/include/ntfs attrib.h,1.26,1.27

[Yura P. <cha...@us...>]

Changes by: cha0smaster

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

Modified Files:
	attrib.h 
Log Message:
Add @from_vcn parameter to ntfs_attr_update_mapping_pairs, update all
users to submit it, thus write speed to very fragmented files
dramatically increased, while write speed to low fragmented files
stayed at approximately same level. 


Index: attrib.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/attrib.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- attrib.h	7 Nov 2005 20:37:08 -0000	1.26
+++ attrib.h	14 Nov 2005 00:17:19 -0000	1.27
@@ -309,7 +309,7 @@ extern int ntfs_resident_attr_value_resi
 extern int ntfs_attr_record_move_to(ntfs_attr_search_ctx *ctx, ntfs_inode *ni);
 extern int ntfs_attr_record_move_away(ntfs_attr_search_ctx *ctx, int extra);
 
-extern int ntfs_attr_update_mapping_pairs(ntfs_attr *na);
+extern int ntfs_attr_update_mapping_pairs(ntfs_attr *na, VCN from_vcn);
 
 extern int ntfs_attr_truncate(ntfs_attr *na, const s64 newsize);
 

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.340,1.341

[Yura P. <cha...@us...>]

Changes by: cha0smaster

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

Modified Files:
	ChangeLog 
Log Message:
Add @from_vcn parameter to ntfs_attr_update_mapping_pairs, update all
users to submit it, thus write speed to very fragmented files
dramatically increased, while write speed to low fragmented files
stayed at approximately same level. 


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.340
retrieving revision 1.341
diff -u -p -r1.340 -r1.341
--- ChangeLog	13 Nov 2005 21:48:35 -0000	1.340
+++ ChangeLog	14 Nov 2005 00:17:19 -0000	1.341
@@ -81,7 +81,11 @@ xx/xx/2005 - 1.12.2-WIP
 	- Make ntfsinfo report the MFT record flags properly, this includes
 	  the less encountered flags, and reporting the in_use flag instead of
 	  inverting it to unused.  (Yuval)
-	- mkntfs: fix segfault when volume had more than 2^31 clusters. (Szaka)
+	- mkntfs: fix segfault when volume had more than 2^31 clusters.  (Szaka)
+	- Add @from_vcn parameter to ntfs_attr_update_mapping_pairs, update all
+	  users to submit it, thus write speed to very fragmented files
+	  dramatically increased, while write speed to low fragmented files
+	  stayed at approximately same level.  (Yura)
 
 10/10/2005 - 1.12.1 - Minor fix to location of mount.ntfs-fuse and mkfs.ntfs.
 

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs attrib.c,1.194,1.195

[Yura P. <cha...@us...>]

Changes by: cha0smaster

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

Modified Files:
	attrib.c 
Log Message:
Add @from_vcn parameter to ntfs_attr_update_mapping_pairs, update all
users to submit it, thus write speed to very fragmented files
dramatically increased, while write speed to low fragmented files
stayed at approximately same level. 


Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/attrib.c,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -p -r1.194 -r1.195
--- attrib.c	7 Nov 2005 20:37:08 -0000	1.194
+++ attrib.c	14 Nov 2005 00:17:19 -0000	1.195
@@ -916,6 +916,7 @@ rl_err_out:
 s64 ntfs_attr_pwrite(ntfs_attr *na, const s64 pos, s64 count, const void *b)
 {
 	s64 written, to_write, ofs, total, old_initialized_size, old_data_size;
+	VCN update_from = -1;
 	ntfs_volume *vol;
 	ntfs_attr_search_ctx *ctx = NULL;
 	runlist_element *rl;
@@ -1202,6 +1203,8 @@ s64 ntfs_attr_pwrite(ntfs_attr *na, cons
 			}
 			na->rl = rl;
 			need_to.update_mapping_pairs = 1;
+			if (update_from == -1)
+				update_from = from_vcn;
 			rl = ntfs_attr_find_vcn(na, cur_vcn);
 			if (!rl) {
 				/*
@@ -1300,7 +1303,7 @@ done:
 		ntfs_attr_put_search_ctx(ctx);
 	/* Update mapping pairs if needed. */
 	if (need_to.update_mapping_pairs)
-		ntfs_attr_update_mapping_pairs(na);
+		ntfs_attr_update_mapping_pairs(na, update_from);
 	/* Finally, return the number of bytes written. */
 	return total;
 rl_err_out:
@@ -1353,7 +1356,7 @@ err_out:
 		ntfs_attr_put_search_ctx(ctx);
 	/* Update mapping pairs if needed. */
 	if (need_to.update_mapping_pairs)
-		ntfs_attr_update_mapping_pairs(na);
+		ntfs_attr_update_mapping_pairs(na, update_from);
 	/* Restore original data_size if needed. */
 	if (need_to.undo_data_size && ntfs_attr_truncate(na, old_data_size))
 		ntfs_log_trace("Failed to restore data_size.\n");
@@ -4037,6 +4040,7 @@ static int ntfs_attr_make_resident(ntfs_
 /**
  * ntfs_attr_update_mapping_pairs - update mapping pairs for ntfs attribute
  * @na:		non-resident ntfs open attribute for which we need update
+ * @from_vcn:	update runlist starting this VCN
  *
  * Build mapping pairs from na->runlist and write them to the disk. Also, this
  * function updates sparse bit and allocates/frees space for compressed_size,
@@ -4047,7 +4051,7 @@ static int ntfs_attr_make_resident(ntfs_
  *	ENOMEM - Not enough memory to complete operation.
  *	ENOSPC - There is no enough space in base mft to resize $ATTRIBUTE_LIST.
  */
-int ntfs_attr_update_mapping_pairs(ntfs_attr *na)
+int ntfs_attr_update_mapping_pairs(ntfs_attr *na, VCN from_vcn)
 {
 	ntfs_attr_search_ctx *ctx;
 	ntfs_inode *ni, *base_ni;
@@ -4090,9 +4094,35 @@ retry:
 	stop_vcn = 0;
 	finished_build = FALSE;
 	while (!ntfs_attr_lookup(na->type, na->name, na->name_len,
-				CASE_SENSITIVE, 0, NULL, 0, ctx)) {
+				CASE_SENSITIVE, from_vcn, NULL, 0, ctx)) {
 		a = ctx->attr;
 		m = ctx->mrec;
+		/*
+		 * If runlist is updating not from the beginning, then set
+		 * @stop_vcn properly, i.e. to the lowest vcn of record that
+		 * contain @from_vcn. Also we do not need @from_vcn anymore,
+		 * set it to 0 to make ntfs_attr_lookup enumerate attributes.
+		 */
+		if (from_vcn) {
+			LCN first_lcn;
+
+			stop_vcn = sle64_to_cpu(a->lowest_vcn);
+			from_vcn = 0;
+			/*
+			 * Check whether the first run we need to update is
+			 * the last run in runlist, if so, then deallocate
+			 * all attrubute extents starting this one.
+			 */
+			first_lcn = ntfs_rl_vcn_to_lcn(na->rl, stop_vcn);
+			if (first_lcn == LCN_EINVAL) {
+				ntfs_log_trace("BUG! Incorrect runlist.\n");
+				err = EIO;
+				goto put_err_out;
+			}
+			if (first_lcn == LCN_ENOENT ||
+					first_lcn == LCN_RL_NOT_MAPPED)
+				finished_build = TRUE;
+		}
 
 		/*
 		 * Check whether we finished mapping pairs build, if so mark
@@ -4319,10 +4349,11 @@ retry:
 			finished_build = TRUE;
 		if (!finished_build && errno != ENOSPC) {
 			err = errno;
-			ntfs_log_trace("BUG!  Mapping pairs build failed.  Please "
-					"run chkdsk and if that doesn't find "
-					"any errors please report you saw this "
-					"message to lin...@li....\n");
+			ntfs_log_trace("BUG!  Mapping pairs build failed.  "
+					"Please run chkdsk and if that doesn't "
+					"find any errors please report you saw "
+					"this message to "
+					"lin...@li....\n");
 			goto put_err_out;
 		}
 		a->highest_vcn = cpu_to_sle64(stop_vcn - 1);
@@ -4518,7 +4549,7 @@ static int ntfs_non_resident_attr_shrink
 		}
 
 		/* Write mapping pairs for new runlist. */
-		if (ntfs_attr_update_mapping_pairs(na)) {
+		if (ntfs_attr_update_mapping_pairs(na, first_free_vcn)) {
 			err = errno;
 			ntfs_log_trace("Eeek! Mapping pairs update failed. Leaving "
 					"inconstant metadata. Run chkdsk.\n");
@@ -4734,7 +4765,8 @@ static int ntfs_non_resident_attr_expand
 		na->rl = rln;
 
 		/* Write mapping pairs for new runlist. */
-		if (ntfs_attr_update_mapping_pairs(na)) {
+		if (ntfs_attr_update_mapping_pairs(na, na->allocated_size >>
+				vol->cluster_size_bits)) {
 			err = errno;
 			ntfs_log_trace("Eeek! Mapping pairs update failed.\n");
 			goto rollback;
@@ -4818,7 +4850,8 @@ rollback:
 				"failed.\n");
 	} else {
 		/* Restore mapping pairs. */
-		if (ntfs_attr_update_mapping_pairs(na)) {
+		if (ntfs_attr_update_mapping_pairs(na, na->allocated_size >>
+					vol->cluster_size_bits)) {
 			ntfs_log_trace("Eeek! Couldn't restore old mapping pairs. "
 					"Rollback failed.\n");
 		}

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.c,1.105,1.106

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

Changes by: szaka

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

Modified Files:
	mkntfs.c 
Log Message:
initialize_secure(): fix segfault when non-allocated objects were referenced
(thanks to ef)


Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- mkntfs.c	13 Nov 2005 20:04:29 -0000	1.105
+++ mkntfs.c	13 Nov 2005 22:40:19 -0000	1.106
@@ -2878,6 +2878,8 @@ static int initialize_secure(char *sds, 
 	err = 0;
 
 	while ((char*)sds_header < (char*)sds + sds_size) {
+		if (!sds_header->length)
+			break;
 		/* SDH index entry */
 		idx_entry_sdh->data_offset = cpu_to_le16(0x18);
 		idx_entry_sdh->data_length = cpu_to_le16(0x14);
@@ -2923,8 +2925,6 @@ static int initialize_secure(char *sds, 
 		sds_header = (SECURITY_DESCRIPTOR_HEADER*)((char*)sds_header +
 				(cpu_to_le32(sds_header->length + 0x0F) &
 					~cpu_to_le32(0x0F)));
-		if (!sds_header->length)
-			break;
 	}
 
 	free(idx_entry_sdh);

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.339,1.340

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

Changes by: szaka

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

Modified Files:
	ChangeLog 
Log Message:
ntfsclone: check the available free space for --save-image too


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.339
retrieving revision 1.340
diff -u -p -r1.339 -r1.340
--- ChangeLog	13 Nov 2005 02:38:17 -0000	1.339
+++ ChangeLog	13 Nov 2005 21:48:35 -0000	1.340
@@ -54,10 +54,10 @@ xx/xx/2005 - 1.12.2-WIP
 	- Fix comment formats.  (Yuval)
 	- ntfsinfo and ntfsls follow the convention how other utilities read
 	  the device argument: no -d or --device option is needed.  (Szaka)
-	- ntfsinfo: figure out and dump index attribute types.  (Szaka)
-	- ntfsinfo: dump index attribute keys.  (Szaka)
-	- mkntfs: don't fill the last $MFT cluster with empty MFT records. 
-	  This is needed to conform to Windows' format behavior.  (Szaka)
+	- ntfsinfo: dump index attribute types and keys. (Szaka)
+	- mkntfs: don't fill the last $MFT cluster with empty MFT records if 
+	  the cluster size <= 16 kB. This is needed to conform to Windows' 
+	  format behavior.  (Szaka)
 	- Add @flags field to struct ntfs_inode. Remove NIno{Sparse,Compressed,
 	  Encrypted}, update all users to use @(ntfs_inode)->flags.  (Yura)
 	- Make @(ntfs_inode)->data_size and @(ntfs_inode)->allocated_size to
@@ -68,7 +68,7 @@ xx/xx/2005 - 1.12.2-WIP
 	  handle them.  (Yura)
 	- Fix allocated data size for resident attributes.  (Yura)
 	- ntfsclone: check available free space on the destination before
-	  starting to clone or restore.  (Szaka)
+	  starting to clone, image or restore.  (Szaka)
 	- Change @type parameter for ntfs_create() to be dev_t rather than
 	  internal NTFS_DT_* constants.  (Yura)
 	- New APIs (dir.[ch]):

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsclone.c,1.66,1.67

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

Changes by: szaka

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

Modified Files:
	ntfsclone.c 
Log Message:
ntfsclone: check the available free space for --save-image too


Index: ntfsclone.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsclone.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- ntfsclone.c	7 Nov 2005 21:38:58 -0000	1.66
+++ ntfsclone.c	13 Nov 2005 21:48:35 -0000	1.67
@@ -1449,9 +1449,12 @@ static void check_dest_free_space(u64 sr
 	u64 dest_bytes;
 	struct statvfs stvfs;
 
-	if (opt.save_image || opt.metadata || opt.blkdev_out || opt.std_out)
+	if (opt.metadata || opt.blkdev_out || opt.std_out)
 		return;
-
+	/* 
+	 * TODO: save_image needs a bit more space than src_bytes
+	 * due to the free space encoding overhead.
+	 */
 	if (fstatvfs(fd_out, &stvfs) == -1) {
 		Printf("WARNING: Unknown free space on the destination: %s\n",
 		       strerror(errno));

Re: [Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.c,1.104,1.105

[Szakacsits S. <sz...@si...>]

On Sun, 13 Nov 2005, Anton Altaparmakov wrote:
> On Sun, 13 Nov 2005, Szabolcs Szakacsits wrote:
> > Changes by: szaka
> > 
> > Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs
> > In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4415/ntfsprogs
> > 
> > Modified Files:
> > 	mkntfs.c 
> > Log Message:
> > Fix fs creation with 32 and 64 kB cluster size; also if only one cluster 
> > contains all system files then fill the rest of it with empty, formatted 
> > records as 'format' also does 
> 
> Now I am confused.  

I was too for a while when I realised that the above is needed in _some_ 
cases.

> That code was there before (well ok, code of equivalent functionality).

Actually it wasn't exactly equivalent, only almost. That code always 
rounded up the mft size to cluster boundary, this one only if all system 
files fits into the first cluster. New, empty records are added also only 
in this case, not otherwise. 

In short none of us was right, the truth is between them.

> You ripped it out saying that it wasn't true anymore 

It wasn't using upto 16 kB cluster sizes but it was almost ok for bigger
ones.

> and now you are fixing a problem by bringing it back in? 

It's back only for 32 and 64 kB cluster sizes, not for others.

> Curious...  So what was wrong with my code then?

It did the same for all cluster sizes but rounding and empty record filling 
is needed only for 32 and 64 kB cluster sizes.

> Also note that AFAICS your so called fix is incomplete as it does not 
> extend the mft mirror to cover the number of mft records stored in a 
> cluster (althought this may be happening automatically elsewhere, don't 
> know anymore what mkntfs looks like these days...).

It happens the same way as before during "Updating $MFTMirr".

I test with the below script and mkntfs works fine with all cluster sizes 
again.

ElectricFence:
=====> 512 SUCCESS
=====> 1024 SUCCESS
=====> 2048 SUCCESS
=====> 4096 SUCCESS
=====> 8192 SUCCESS
=====> 16384 SUCCESS
=====> 32768 SUCCESS
=====> 65536 SUCCESS
Normal:
=====> 512 SUCCESS
=====> 1024 SUCCESS
=====> 2048 SUCCESS
=====> 4096 SUCCESS
=====> 8192 SUCCESS
=====> 16384 SUCCESS
=====> 32768 SUCCESS
=====> 65536 SUCCESS

---------------------------------------------------------------->
#!/bin/sh

touch mkntfs.img

cd /tmp

do_test() {

for i in `seq 9 16` ; do
        BS=`echo "2^$i" | bc`
        echo -n "=====> $BS "
        rm mkntfs.img
        touch mkntfs.img
        $EF mkntfs -Ff -c $BS mkntfs.img 34359738 2> /dev/null > /dev/null && \
        ntfsresize -fi mkntfs.img > /dev/null && \
        echo SUCCESS || echo FAILED
done
}

echo ElectricFence:
EF=ef;    do_test

echo Normal:
unset EF; do_test
<----------------------------------------------------------------

And this is what's left for mkntfs v3.1:

Inode 0 attribute 0x30 content:   DIFFER
Inode 0 attribute 0x80 content:   DIFFER
Inode 1 attribute 0x80 content:   DIFFER
Inode 2 attribute 0x30 content:   DIFFER
Inode 2 attribute 0x80 length:   46153728  !=  4194304
Inode 4 attribute 0x30 content:   DIFFER
Inode 5 attribute 0x50 length:   4144  !=  4608
Inode 5 attribute 0xa0:$I30 content:   DIFFER
Inode 6 attribute 0x80 content:   DIFFER
Inode 7 attribute 0x80 content:   DIFFER
Inode 9 attribute 0x30 content:   DIFFER
Inode 9 attribute 0x80:$SDS length:   262396  !=  262720
Inode 9 attribute 0x90:$SDH length:   144  !=  288
Inode 9 attribute 0x90:$SII length:   128  !=  248
Inode 11 attribute 0x90:$I30 content:   DIFFER
Inode 24 attribute 0x90:$O content:   DIFFER
Inode 24 attribute 0x90:$Q content:   DIFFER

	Szaka

Re: [Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.c,1.104,1.105

[Anton A. <ai...@ca...>]

On Sun, 13 Nov 2005, Szabolcs Szakacsits wrote:
> Changes by: szaka
> 
> Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs
> In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4415/ntfsprogs
> 
> Modified Files:
> 	mkntfs.c 
> Log Message:
> Fix fs creation with 32 and 64 kB cluster size; also if only one cluster 
> contains all system files then fill the rest of it with empty, formatted 
> records as 'format' also does 

Now I am confused.  That code was there before (well ok, code of 
equivalent functionality).  You ripped it out saying that it wasn't true 
anymore and now you are fixing a problem by bringing it back in?  
Curious...  So what was wrong with my code then?

Also note that AFAICS your so called fix is incomplete as it does not 
extend the mft mirror to cover the number of mft records stored in a 
cluster (althought this may be happening automatically elsewhere, don't 
know anymore what mkntfs looks like these days...).

Best regards,

	Anton
-- 
Anton Altaparmakov <aia21 at cam.ac.uk> (replace at with @)
Unix Support, Computing Service, University of Cambridge, CB2 3QH, UK
Linux NTFS maintainer / IRC: #ntfs on irc.freenode.net
WWW: http://linux-ntfs.sf.net/ & http://www-stu.christs.cam.ac.uk/~aia21/

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.c,1.104,1.105

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

Changes by: szaka

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

Modified Files:
	mkntfs.c 
Log Message:
Fix fs creation with 32 and 64 kB cluster size; also if only one cluster 
contains all system files then fill the rest of it with empty, formatted 
records as 'format' also does 


Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- mkntfs.c	13 Nov 2005 02:38:17 -0000	1.104
+++ mkntfs.c	13 Nov 2005 20:04:29 -0000	1.105
@@ -3783,10 +3783,13 @@ static void mkntfs_initialize_bitmaps(vo
 	for (i = g_vol->nr_clusters; i < (u64)g_lcn_bitmap_byte_size << 3; i++)
 		ntfs_bit_set(g_lcn_bitmap, i, 1);
 	/*
-	 * Determine mft_size: (16 (1.2) or 27 (3.0+) mft records)
+	 * Determine mft_size: (16 (1.2) or 27 (3.0+) mft records) or
+	 * one cluster, whichever is bigger.
 	 */
 	g_mft_size = ((16 + 11 * (g_vol->major_ver >= 3)) *
 			g_vol->mft_record_size);
+	if (g_mft_size < (s32)g_vol->cluster_size)
+		g_mft_size = g_vol->cluster_size;
 	ntfs_log_debug("MFT size = %i (0x%x) bytes\n", g_mft_size, g_mft_size);
 	/* Determine mft bitmap size and allocate it. */
 	g_mft_bitmap_size = g_mft_size / g_vol->mft_record_size;
@@ -4304,8 +4307,10 @@ static void mkntfs_create_root_structure
 	u8 *sd;
 	FILE_ATTR_FLAGS extend_flags;
 	VOLUME_FLAGS volume_flags = 0;
+	int nr_sysfiles;
 
 	ntfs_log_quiet("Creating NTFS volume structures.\n");
+	nr_sysfiles = g_vol->major_ver < 3 ? 16 : 27;
 	/*
 	 * Setup an empty mft record.  Note, we can just give 0 as the mft
 	 * reference as we are creating an NTFS 1.2 volume for which the mft
@@ -4315,20 +4320,34 @@ static void mkntfs_create_root_structure
 	 * sequence numbers of each system file to equal the mft record number
 	 * of that file (only for $MFT is the sequence number 1 rather than 0).
 	 */
-	for (i = 0; i < 16 + 11 * (g_vol->major_ver >= 3); i++) {
+	for (i = 0; i < nr_sysfiles; i++) {
 		if (ntfs_mft_record_layout(g_vol, 0, m = (MFT_RECORD *)(g_buf +
 				i * g_vol->mft_record_size)))
-			err_exit("Error:  Failed to layout mft record.\n");
+			err_exit("Failed to layout system mft records.\n");
 		if (i > 0)
 			m->sequence_number = cpu_to_le16(i);
 		if (i == 0)
 			m->sequence_number = cpu_to_le16(1);
 	}
 	/*
+	 * If only one cluster contains all system files then
+	 * fill the rest of it with empty, formatted records.
+	 */
+	if (nr_sysfiles * (s32)g_vol->mft_record_size < g_mft_size) {
+		for (i = nr_sysfiles; 
+		      i * (s32)g_vol->mft_record_size < g_mft_size; i++) {
+			m = (MFT_RECORD *)(g_buf + i * g_vol->mft_record_size);
+			if (ntfs_mft_record_layout(g_vol, 0, m))
+				err_exit("Failed to layout mft record.\n");
+			m->flags = cpu_to_le16(0);
+			m->sequence_number = cpu_to_le16(i);
+		}
+	}
+	/*
 	 * Create the 16 system files, adding the system information attribute
 	 * to each as well as marking them in use in the mft bitmap.
 	 */
-	for (i = 0; i < 16 + 11 * (g_vol->major_ver >= 3); i++) {
+	for (i = 0; i < nr_sysfiles; i++) {
 		u32 file_attrs;
 
 		m = (MFT_RECORD*)(g_buf + i * g_vol->mft_record_size);
@@ -4452,6 +4471,7 @@ static void mkntfs_create_root_structure
 	if (err < 0)
 		err_exit("Couldn't create $MFT: %s\n", strerror(-err));
 	/* dump_mft_record(m); */
+
 	ntfs_log_verbose("Creating $MFTMirr (mft record 1)\n");
 	m = (MFT_RECORD*)(g_buf + 1 * g_vol->mft_record_size);
 	err = add_attr_data_positioned(m, NULL, 0, 0, 0, g_rl_mftmirr, g_buf,

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs volume.c,1.65,1.66

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

Changes by: szaka

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

Modified Files:
	volume.c 
Log Message:
ntfs_device_mount(): explain a bit better what fails and how


Index: volume.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/volume.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- volume.c	5 Nov 2005 01:34:21 -0000	1.65
+++ volume.c	13 Nov 2005 19:25:05 -0000	1.66
@@ -787,8 +787,8 @@ ntfs_volume *ntfs_device_mount(struct nt
 		if (l == -1)
 			ntfs_log_perror("Failed to read $MFT");
 		else {
-			ntfs_log_debug("Length of data not equal expected "
-					"length.\n");
+			ntfs_log_debug("Failed to read $MFT, unexpected length "
+				       "(%d != %lld).\n", vol->mftmirr_size, l);
 			errno = EIO;
 		}
 		goto error_exit;
@@ -799,8 +799,9 @@ ntfs_volume *ntfs_device_mount(struct nt
 		if (l == -1)
 			ntfs_log_perror("Failed to read $MFTMirr");
 		else {
-			ntfs_log_debug("Length of data not equal expected "
-					"length.\n");
+			ntfs_log_debug("Failed to read $MFTMirr, unexpected "
+				       "length (%d != %lld).\n", 
+				       vol->mftmirr_size, l);
 			errno = EIO;
 		}
 		goto error_exit;

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.338,1.339

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

Changes by: szaka

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

Modified Files:
	ChangeLog 
Log Message:
mkntfs: fix segfault when volume has more than 2^31 clusters


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.338
retrieving revision 1.339
diff -u -p -r1.338 -r1.339
--- ChangeLog	11 Nov 2005 23:55:14 -0000	1.338
+++ ChangeLog	13 Nov 2005 02:38:17 -0000	1.339
@@ -81,6 +81,7 @@ xx/xx/2005 - 1.12.2-WIP
 	- Make ntfsinfo report the MFT record flags properly, this includes
 	  the less encountered flags, and reporting the in_use flag instead of
 	  inverting it to unused.  (Yuval)
+	- mkntfs: fix segfault when volume had more than 2^31 clusters. (Szaka)
 
 10/10/2005 - 1.12.1 - Minor fix to location of mount.ntfs-fuse and mkfs.ntfs.
 

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.c,1.103,1.104

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

Changes by: szaka

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

Modified Files:
	mkntfs.c 
Log Message:
mkntfs: fix segfault when volume has more than 2^31 clusters


Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- mkntfs.c	12 Nov 2005 20:52:38 -0000	1.103
+++ mkntfs.c	13 Nov 2005 02:38:17 -0000	1.104
@@ -3762,7 +3762,7 @@ static void mkntfs_initialize_bitmaps(vo
 	 *     g_rl_mft_bmp
 	 *     g_vol
 	 */
-	int i, j;
+	u64 i;
 
 	/* Determine lcn bitmap byte size and allocate it. */
 	g_lcn_bitmap_byte_size = (g_vol->nr_clusters + 7) >> 3;
@@ -3770,7 +3770,7 @@ static void mkntfs_initialize_bitmaps(vo
 	g_lcn_bitmap_byte_size = (g_lcn_bitmap_byte_size + 7) & ~7;
 	i = (g_lcn_bitmap_byte_size + g_vol->cluster_size - 1) &
 			~(g_vol->cluster_size - 1);
-	ntfs_log_debug("g_lcn_bitmap_byte_size = %i, allocated = %i\n",
+	ntfs_log_debug("g_lcn_bitmap_byte_size = %i, allocated = %llu\n",
 			g_lcn_bitmap_byte_size, i);
 	g_lcn_bitmap = calloc(1, g_lcn_bitmap_byte_size);
 	if (!g_lcn_bitmap)
@@ -3780,8 +3780,8 @@ static void mkntfs_initialize_bitmaps(vo
 	 * $Bitmap can overlap the end of the volume. Any bits in this region
 	 * must be set. This region also encompasses the backup boot sector.
 	 */
-	for (i = g_vol->nr_clusters; i < g_lcn_bitmap_byte_size << 3; i++)
-		ntfs_bit_set(g_lcn_bitmap, (u64)i, 1);
+	for (i = g_vol->nr_clusters; i < (u64)g_lcn_bitmap_byte_size << 3; i++)
+		ntfs_bit_set(g_lcn_bitmap, i, 1);
 	/*
 	 * Determine mft_size: (16 (1.2) or 27 (3.0+) mft records)
 	 */
@@ -3807,8 +3807,8 @@ static void mkntfs_initialize_bitmaps(vo
 				strerror(errno));
 	g_rl_mft_bmp[0].vcn = 0LL;
 	/* Mft bitmap is right after $Boot's data. */
-	j = (8192 + g_vol->cluster_size - 1) / g_vol->cluster_size;
-	g_rl_mft_bmp[0].lcn = j;
+	i = (8192 + g_vol->cluster_size - 1) / g_vol->cluster_size;
+	g_rl_mft_bmp[0].lcn = i;
 	/*
 	 * Size is always one cluster, even though valid data size and
 	 * initialized data size are only 8 bytes.
@@ -3817,7 +3817,7 @@ static void mkntfs_initialize_bitmaps(vo
 	g_rl_mft_bmp[1].lcn = -1LL;
 	g_rl_mft_bmp[1].length = 0LL;
 	/* Allocate cluster for mft bitmap. */
-	ntfs_bit_set(g_lcn_bitmap, (s64)j, 1);
+	ntfs_bit_set(g_lcn_bitmap, i, 1);
 }
 
 /**

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.c,1.102,1.103

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

Changes by: szaka

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

Modified Files:
	mkntfs.c 
Log Message:
Log also what actually fails, not only the reason


Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- mkntfs.c	12 Nov 2005 15:35:51 -0000	1.102
+++ mkntfs.c	12 Nov 2005 20:52:38 -0000	1.103
@@ -5010,7 +5010,8 @@ static int mkntfs_redirect(struct mkntfs
 		err = errno;
 		free(rl);
 		if (lw != g_lcn_bitmap_byte_size) {
-			ntfs_log_error("%s\n", lw == -1 ? strerror(err) : "unknown error");
+			ntfs_log_error("ntfs_rlwrite: %s\n", lw == -1 ?
+				       strerror(err) : "unknown error");
 			goto done;
 		}
 	} else {
@@ -5030,7 +5031,8 @@ static int mkntfs_redirect(struct mkntfs
 		if (!opts.no_action)
 			lw = ntfs_mst_pwrite(g_vol->dev, pos, 1, g_vol->mft_record_size, g_buf + i * g_vol->mft_record_size);
 		if (lw != 1) {
-			ntfs_log_error("%s\n", lw == -1 ? strerror(errno) : "unknown error");
+			ntfs_log_error("ntfs_mst_pwrite: %s\n", lw == -1 ?
+				       strerror(errno) : "unknown error");
 			goto done;
 		}
 		pos += g_vol->mft_record_size;
@@ -5055,7 +5057,8 @@ static int mkntfs_redirect(struct mkntfs
 		if (!opts.no_action)
 			lw = ntfs_mst_pwrite(g_vol->dev, pos, 1, g_vol->mft_record_size, g_buf + i * g_vol->mft_record_size);
 		if (lw != 1) {
-			ntfs_log_error("%s\n", lw == -1 ? strerror(errno) : "unknown error");
+			ntfs_log_error("ntfs_mst_pwrite: %s\n", lw == -1 ?
+				       strerror(errno) : "unknown error");
 			goto done;
 		}
 		pos += g_vol->mft_record_size;

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.c,1.101,1.102

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

Changes by: szaka

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

Modified Files:
	mkntfs.c 
Log Message:
Name consistently the same $SDS, $SDH and $SII fields


Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- mkntfs.c	11 Nov 2005 23:35:57 -0000	1.101
+++ mkntfs.c	12 Nov 2005 15:35:51 -0000	1.102
@@ -2893,9 +2893,9 @@ static int initialize_secure(char *sds, 
 		sdh_data->hash = sds_header->hash;
 		sdh_data->security_id = sds_header->security_id;
 
-		sdh_data->offset_in_sds = sds_header->offset;
+		sdh_data->offset = sds_header->offset;
 
-		sdh_data->size_in_sds = sds_header->length;
+		sdh_data->length = sds_header->length;
 		sdh_data->reserved_II =  cpu_to_le32(0x00490049);
 
 		/* SII index entry */
@@ -2911,8 +2911,8 @@ static int initialize_secure(char *sds, 
 			idx_entry_sii->data_offset);
 		sii_data->hash = sds_header->hash;
 		sii_data->security_id = sds_header->security_id;
-		sii_data->offset_in_sds = sds_header->offset;
-		sii_data->size_in_sds = sds_header->length;
+		sii_data->offset = sds_header->offset;
+		sii_data->length = sds_header->length;
 		if ((err = insert_index_entry_in_res_dir_index(idx_entry_sdh,
 			sdh_size, m, NTFS_INDEX_SDH, 4, AT_UNUSED)))
 			break;

[Linux-NTFS-cvs] CVS: ntfsprogs/include/ntfs layout.h,1.46,1.47

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

Changes by: szaka

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

Modified Files:
	layout.h 
Log Message:
Name consistently the same $SDS, $SDH and $SII fields


Index: layout.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/layout.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- layout.h	11 Nov 2005 23:35:56 -0000	1.46
+++ layout.h	12 Nov 2005 15:35:51 -0000	1.47
@@ -1911,20 +1911,15 @@ typedef struct {
 typedef struct {
 	u32 hash;          /* Hash of the security descriptor. */
 	u32 security_id;   /* The security_id assigned to the descriptor. */
-	u64 offset_in_sds; /* Offset of the descriptor in $SDS data stream. */
-	u32 size_in_sds;   /* Size of the descriptor in $SDS data stream. */
+	u64 offset;	   /* Byte offset of this entry in the $SDS stream. */
+	u32 length;	   /* Size in bytes of this entry in $SDS stream. */
 	u32 reserved_II;   /* Padding - always unicode "II". */
 } __attribute__((__packed__)) SDH_INDEX_DATA;
 
 /**
  * struct SII_INDEX_DATA -
  */
-typedef struct {
-	u32 hash;          /* Hash of the security descriptor. */
-	u32 security_id;   /* The security_id assigned to the descriptor. */
-	u64 offset_in_sds; /* Offset of the descriptor in $SDS data stream. */
-	u32 size_in_sds;   /* Size of the descriptor in $SDS data stream. */
-} __attribute__((__packed__)) SII_INDEX_DATA;
+typedef SECURITY_DESCRIPTOR_HEADER SII_INDEX_DATA;
 
 /**
  * struct QUOTA_O_INDEX_DATA -

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsinfo.c,1.96,1.97

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

Changes by: szaka

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

Modified Files:
	ntfsinfo.c 
Log Message:
output cosmetic change; explicit check for /$Extend/$ObjId in get_index_attr_type()


Index: ntfsinfo.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- ntfsinfo.c	11 Nov 2005 23:55:15 -0000	1.96
+++ ntfsinfo.c	12 Nov 2005 12:59:20 -0000	1.97
@@ -497,7 +497,7 @@ static void ntfs_dump_flags(ATTR_TYPES t
 		flags &= ~FILE_ATTR_VIEW_INDEX_PRESENT;
 	}
 	if (flags)
-		printf(" UNKNOWN: 0x%x", (unsigned int)le32_to_cpu(flags));
+		printf(" UNKNOWN: 0x%04x", (unsigned int)le32_to_cpu(flags));
 	printf("\n");
 }
 
@@ -1251,8 +1251,6 @@ static int ntfs_dump_index_entries(INDEX
 		(ntfschar*)((char*)(attr) + le16_to_cpu((attr)->name_offset)), \
 		(attr)->name_length, 0, NULL, 0)
 
-static int get_index_root(ntfs_inode *ni, ATTR_RECORD *attr, INDEX_ROOT *iroot);
-
 static INDEX_ATTR_TYPE get_index_attr_type(ntfs_inode *ni, ATTR_RECORD *attr,
 					   INDEX_ROOT *index_root)
 {
@@ -1289,7 +1287,7 @@ static INDEX_ATTR_TYPE get_index_attr_ty
 	else if (COMPARE_INDEX_NAMES(attr, NTFS_INDEX_O)) {
 		if (!strcmp(file_name, "/$Extend/$Quota"))
 			return INDEX_ATTR_QUOTA_O;
-		else
+		else if (!strcmp(file_name, "/$Extend/$ObjId"))
 			return INDEX_ATTR_OBJID_O;
 	}
 	
@@ -1893,7 +1891,7 @@ static void ntfs_dump_inode_general_info
 			inode_flags &= ~MFT_RECORD_IS_VIEW_INDEX;
 		}
 		if (inode_flags)
-			printf("UNKNOWN:0x%04hx",inode_flags);
+			printf("UNKNOWN: 0x%04hx", inode_flags);
 	} else {
 		printf("none");
 	}

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.337,1.338

[Yuval <uv...@us...>]

Changes by: uvman

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

Modified Files:
	ChangeLog 
Log Message:
Report the MFT record flags properly in ntfsinfo.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.337
retrieving revision 1.338
diff -u -p -r1.337 -r1.338
--- ChangeLog	10 Nov 2005 18:13:15 -0000	1.337
+++ ChangeLog	11 Nov 2005 23:55:14 -0000	1.338
@@ -77,7 +77,10 @@ xx/xx/2005 - 1.12.2-WIP
 	    ntfs_crate_symlink() for Interix symbolic links creation.  (Yura)
 	- Teach ntfs_create() to create Interix FIFOs and sockets.  (Yura)
 	- Fix the -u option in ntfsundelete.  Instead of a confusing optional
-	  parameter, there's a new option -i with a required parameter (Rich)
+	  parameter, there's a new option -i with a required parameter.  (Rich)
+	- Make ntfsinfo report the MFT record flags properly, this includes
+	  the less encountered flags, and reporting the in_use flag instead of
+	  inverting it to unused.  (Yuval)
 
 10/10/2005 - 1.12.1 - Minor fix to location of mount.ntfs-fuse and mkfs.ntfs.
 

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsinfo.c,1.95,1.96

[Yuval <uv...@us...>]

Changes by: uvman

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

Modified Files:
	ntfsinfo.c 
Log Message:
Report the MFT record flags properly in ntfsinfo.

Index: ntfsinfo.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- ntfsinfo.c	11 Nov 2005 23:35:57 -0000	1.95
+++ ntfsinfo.c	11 Nov 2005 23:55:15 -0000	1.96
@@ -1875,15 +1875,25 @@ static void ntfs_dump_inode_general_info
 
 	printf("MFT record Flags:\t\t ");
 	if (inode_flags) {
-		if (!(MFT_RECORD_IN_USE & inode_flags)) {
-			printf("DELETED ");
+		if (MFT_RECORD_IN_USE & inode_flags) {
+			printf("IN_USE ");
+			inode_flags &= ~MFT_RECORD_IN_USE;
 		}
 		if (MFT_RECORD_IS_DIRECTORY & inode_flags) {
 			printf("DIRECTORY ");
+			inode_flags &= ~MFT_RECORD_IS_DIRECTORY;
 		}
-		if (~(MFT_RECORD_IN_USE | MFT_RECORD_IS_DIRECTORY) & inode_flags) {
-			printf("UNKNOWN:0x%04hx",inode_flags);
+		/* The meaning of IS_4 is illusive but not its existence. */
+		if (MFT_RECORD_IS_4 & inode_flags) {
+			printf("IS_4 ");
+			inode_flags &= ~MFT_RECORD_IS_4;
+		}
+		if (MFT_RECORD_IS_VIEW_INDEX & inode_flags) {
+			printf("VIEW_INDEX ");
+			inode_flags &= ~MFT_RECORD_IS_VIEW_INDEX;
 		}
+		if (inode_flags)
+			printf("UNKNOWN:0x%04hx",inode_flags);
 	} else {
 		printf("none");
 	}

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.c,1.100,1.101 ntfsinfo.c,1.94,1.95 ntfsrm.c,1.69,1.70

[Yuval <uv...@us...>]

Changes by: uvman

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

Modified Files:
	mkntfs.c ntfsinfo.c ntfsrm.c 
Log Message:
Give a better name to MFT_RECORD_IS_8 and rename FILE_ATTR_DUP_* to match this meaning.

Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- mkntfs.c	10 Nov 2005 20:54:00 -0000	1.100
+++ mkntfs.c	11 Nov 2005 23:35:57 -0000	1.101
@@ -4358,7 +4358,7 @@ static void mkntfs_create_root_structure
 				add_attr_std_info(m, file_attrs,
 					cpu_to_le32(0x0100));
 			} else if (i == 9) {
-				file_attrs |= FILE_ATTR_DUP_VIEW_INDEX_PRESENT;
+				file_attrs |= FILE_ATTR_VIEW_INDEX_PRESENT;
 				add_attr_std_info(m, file_attrs,
 					cpu_to_le32(0x0101));
 			} else if (i == 11) {
@@ -4366,7 +4366,7 @@ static void mkntfs_create_root_structure
 					cpu_to_le32(0x0101));
 			} else if (i == 24 || i == 25 || i == 26) {
 				file_attrs |= FILE_ATTR_ARCHIVE;
-				file_attrs |= FILE_ATTR_DUP_VIEW_INDEX_PRESENT;
+				file_attrs |= FILE_ATTR_VIEW_INDEX_PRESENT;
 				add_attr_std_info(m, file_attrs,
 					cpu_to_le32(0x0101));
 			} else {
@@ -4384,8 +4384,8 @@ static void mkntfs_create_root_structure
 	m->link_count = cpu_to_le16(le16_to_cpu(m->link_count) + 1);
 	err = add_attr_file_name(m, root_ref, 0LL, 0LL,
 			FILE_ATTR_HIDDEN | FILE_ATTR_SYSTEM |
-			FILE_ATTR_DUP_FILE_NAME_INDEX_PRESENT, 0, 0,
-			".", FILE_NAME_WIN32_AND_DOS);
+			FILE_ATTR_I30_INDEX_PRESENT, 0, 0, ".",
+			FILE_NAME_WIN32_AND_DOS);
 	if (!err) {
 		if (g_vol->major_ver == 1) {
 			init_system_file_sd(FILE_root, &sd, &i);
@@ -4690,14 +4690,13 @@ static void mkntfs_create_root_structure
 	} else {
 		ntfs_log_verbose("Creating $Secure (mft record 9)\n");
 		m = (MFT_RECORD*)(g_buf + 9 * g_vol->mft_record_size);
-		m->flags |= MFT_RECORD_IS_8;
+		m->flags |= MFT_RECORD_IS_VIEW_INDEX;
 		if (!err)
 			err = create_hardlink(g_index_block, root_ref, m,
 					MK_LE_MREF(9, 9), 0LL, 0LL,
 					FILE_ATTR_HIDDEN | FILE_ATTR_SYSTEM |
-					FILE_ATTR_DUP_VIEW_INDEX_PRESENT
-					, 0, 0, "$Secure",
-					FILE_NAME_WIN32_AND_DOS);
+					FILE_ATTR_VIEW_INDEX_PRESENT, 0, 0,
+					"$Secure", FILE_NAME_WIN32_AND_DOS);
 		if (!err) {
 			if (g_vol->minor_ver == 0) {
 				g_buf_sds_first_size = 0x1E0;
@@ -4782,9 +4781,8 @@ static void mkntfs_create_root_structure
 			err = create_hardlink(g_index_block, root_ref, m,
 					MK_LE_MREF(11, 11), 0LL, 0LL,
 					FILE_ATTR_HIDDEN | FILE_ATTR_SYSTEM |
-					FILE_ATTR_DUP_FILE_NAME_INDEX_PRESENT,
-					0, 0, "$Extend",
-					FILE_NAME_WIN32_AND_DOS);
+					FILE_ATTR_I30_INDEX_PRESENT, 0, 0,
+					"$Extend", FILE_NAME_WIN32_AND_DOS);
 		/* FIXME: This should be IGNORE_CASE */
 		if (!err)
 			err = add_attr_index_root(m, "$I30", 4, 0, AT_FILE_NAME,
@@ -4811,11 +4809,11 @@ static void mkntfs_create_root_structure
 	/* starting vith file 24 (ignoring file 16-23) */
 	if (g_vol->major_ver >= 3) {
 		extend_flags = FILE_ATTR_HIDDEN | FILE_ATTR_SYSTEM |
-			FILE_ATTR_ARCHIVE | FILE_ATTR_DUP_VIEW_INDEX_PRESENT;
+			FILE_ATTR_ARCHIVE | FILE_ATTR_VIEW_INDEX_PRESENT;
 		ntfs_log_verbose("Creating $Quota (mft record 24)\n");
 		m = (MFT_RECORD*)(g_buf + 24 * g_vol->mft_record_size);
 		m->flags |= MFT_RECORD_IS_4;
-		m->flags |= MFT_RECORD_IS_8;
+		m->flags |= MFT_RECORD_IS_VIEW_INDEX;
 		if (!err)
 			err = create_hardlink_res((MFT_RECORD*)(g_buf +
 				11 * g_vol->mft_record_size), extend_ref, m,
@@ -4836,7 +4834,7 @@ static void mkntfs_create_root_structure
 		ntfs_log_verbose("Creating $ObjId (mft record 25)\n");
 		m = (MFT_RECORD*)(g_buf + 25 * g_vol->mft_record_size);
 		m->flags |= MFT_RECORD_IS_4;
-		m->flags |= MFT_RECORD_IS_8;
+		m->flags |= MFT_RECORD_IS_VIEW_INDEX;
 		if (!err)
 			err = create_hardlink_res((MFT_RECORD*)(g_buf +
 					11 * g_vol->mft_record_size), extend_ref,
@@ -4853,7 +4851,7 @@ static void mkntfs_create_root_structure
 		ntfs_log_verbose("Creating $Reparse (mft record 26)\n");
 		m = (MFT_RECORD*)(g_buf + 26 * g_vol->mft_record_size);
 		m->flags |= MFT_RECORD_IS_4;
-		m->flags |= MFT_RECORD_IS_8;
+		m->flags |= MFT_RECORD_IS_VIEW_INDEX;
 		if (!err)
 			err = create_hardlink_res((MFT_RECORD*)(g_buf +
 					11 * g_vol->mft_record_size),

Index: ntfsinfo.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- ntfsinfo.c	7 Nov 2005 22:28:46 -0000	1.94
+++ ntfsinfo.c	11 Nov 2005 23:35:57 -0000	1.95
@@ -484,15 +484,17 @@ static void ntfs_dump_flags(ATTR_TYPES t
 		printf(" ENCRYPTED");
 		flags &= ~FILE_ATTR_ENCRYPTED;
 	}
+	/* We know that FILE_ATTR_I30_INDEX_PRESENT only exists on $FILE_NAME,
+	   and in case we are wrong, let it appear as UNKNOWN */
 	if (type == AT_FILE_NAME) {
-		if (flags & FILE_ATTR_DUP_FILE_NAME_INDEX_PRESENT) {
-			printf(" FILE_NAME_INDEX");
-			flags &= ~FILE_ATTR_DUP_FILE_NAME_INDEX_PRESENT;
+		if (flags & FILE_ATTR_I30_INDEX_PRESENT) {
+			printf(" I30_INDEX");
+			flags &= ~FILE_ATTR_I30_INDEX_PRESENT;
 		}
 	}
-	if (flags & FILE_ATTR_DUP_VIEW_INDEX_PRESENT) {
+	if (flags & FILE_ATTR_VIEW_INDEX_PRESENT) {
 		printf(" VIEW_INDEX");
-		flags &= ~FILE_ATTR_DUP_VIEW_INDEX_PRESENT;
+		flags &= ~FILE_ATTR_VIEW_INDEX_PRESENT;
 	}
 	if (flags)
 		printf(" UNKNOWN: 0x%x", (unsigned int)le32_to_cpu(flags));

Index: ntfsrm.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsrm.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- ntfsrm.c	28 Oct 2005 04:47:52 -0000	1.69
+++ ntfsrm.c	11 Nov 2005 23:35:57 -0000	1.70
@@ -381,7 +381,7 @@ static BOOL utils_pathname_to_inode2(ntf
 			ntfs_log_debug("dt = %p, data_len = %d, parent = %p\n", dt, dt->data_len, dt->parent);
 
 			//printf("dt's flags = 0x%08x\n", dt->children[dt_num]->key.file_name.file_attributes);
-			if (dt->children[dt_num]->key.file_name.file_attributes == FILE_ATTR_DUP_FILE_NAME_INDEX_PRESENT) {
+			if (dt->children[dt_num]->key.file_name.file_attributes == FILE_ATTR_I30_INDEX_PRESENT) {
 				//printf("DIR\n");
 				child = ntfs_dir_create(dir->vol, dt->children[dt_num]->indexed_file);
 				//printf("child = %p (%lld)\n", child, MREF(dt->children[dt_num]->indexed_file));

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

[Yuval <uv...@us...>]

Changes by: uvman

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

Modified Files:
	dir.c 
Log Message:
Give a better name to MFT_RECORD_IS_8 and rename FILE_ATTR_DUP_* to match this meaning.

Index: dir.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/dir.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- dir.c	10 Nov 2005 18:13:16 -0000	1.45
+++ dir.c	11 Nov 2005 23:35:57 -0000	1.46
@@ -643,8 +643,7 @@ static inline int ntfs_filldir(ntfs_inod
 	/* Skip root directory self reference entry. */
 	if (MREF_LE(ie->indexed_file) == FILE_root)
 		return 0;
-	if (ie->key.file_name.file_attributes &
-			FILE_ATTR_DUP_FILE_NAME_INDEX_PRESENT)
+	if (ie->key.file_name.file_attributes & FILE_ATTR_I30_INDEX_PRESENT)
 		dt_type = NTFS_DT_DIR;
 	else
 		dt_type = NTFS_DT_REG;
@@ -1254,7 +1253,7 @@ static ntfs_inode *__ntfs_create(ntfs_in
 	fn->file_name_length = name_len;
 	fn->file_name_type = FILE_NAME_POSIX;
 	if (S_ISDIR(type))
-		fn->file_attributes = FILE_ATTR_DUP_FILE_NAME_INDEX_PRESENT;
+		fn->file_attributes = FILE_ATTR_I30_INDEX_PRESENT;
 	if (!S_ISREG(type) && !S_ISDIR(type))
 		fn->file_attributes = FILE_ATTR_SYSTEM;
 	fn->creation_time = utc2ntfs(ni->creation_time);
@@ -1576,7 +1575,7 @@ int ntfs_link(ntfs_inode *ni, ntfs_inode
 	fn->file_name_type = FILE_NAME_POSIX;
 	fn->file_attributes = ni->flags;
 	if (ni->mrec->flags & MFT_RECORD_IS_DIRECTORY)
-		fn->file_attributes |= FILE_ATTR_DUP_FILE_NAME_INDEX_PRESENT;
+		fn->file_attributes |= FILE_ATTR_I30_INDEX_PRESENT;
 	fn->allocated_size = cpu_to_sle64(ni->allocated_size);
 	fn->data_size = cpu_to_sle64(ni->data_size);
 	fn->creation_time = utc2ntfs(ni->creation_time);

[Linux-NTFS-cvs] CVS: ntfsprogs/include/ntfs layout.h,1.45,1.46

[Yuval <uv...@us...>]

Changes by: uvman

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

Modified Files:
	layout.h 
Log Message:
Give a better name to MFT_RECORD_IS_8 and rename FILE_ATTR_DUP_* to match this meaning.

Index: layout.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/layout.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- layout.h	7 Nov 2005 22:22:43 -0000	1.45
+++ layout.h	11 Nov 2005 23:35:56 -0000	1.46
@@ -247,15 +247,22 @@ typedef enum {
  *
  * These are the so far known MFT_RECORD_* flags (16-bit) which contain
  * information about the mft record in which they are present.
- * _4 and _8 are needed by $Extend sub-files (don't know what to
- * call them yet...)
+ * 
+ * MFT_RECORD_IS_4 exists on all $Extend sub-files.
+ * It seems that it marks it is a metadata file with MFT record >24, however,
+ * it is unknown if it is limited to metadata files only.
+ *
+ * MFT_RECORD_IS_VIEW_INDEX exists on every metafile with a non directory
+ * index, that means an INDEX_ROOT and an INDEX_ALLOCATION with a name other
+ * than "$I30". It is unknown if it is limited to metadata files only.
  */
 typedef enum {
-	MFT_RECORD_IN_USE	= const_cpu_to_le16(0x0001),
-	MFT_RECORD_IS_DIRECTORY	= const_cpu_to_le16(0x0002),
-	MFT_RECORD_IS_4		= const_cpu_to_le16(0x0004),
-	MFT_RECORD_IS_8		= const_cpu_to_le16(0x0008),
-	MFT_REC_SPACE_FILLER	= 0xffff	/* Just to make flags 16-bit. */
+	MFT_RECORD_IN_USE		= const_cpu_to_le16(0x0001),
+	MFT_RECORD_IS_DIRECTORY		= const_cpu_to_le16(0x0002),
+	MFT_RECORD_IS_4			= const_cpu_to_le16(0x0004),
+	MFT_RECORD_IS_VIEW_INDEX	= const_cpu_to_le16(0x0008),
+	MFT_REC_SPACE_FILLER		= 0xffff, /* Just to make flags
+						     16-bit. */
 } __attribute__((__packed__)) MFT_RECORD_FLAGS;
 
 /*
@@ -857,19 +864,30 @@ typedef enum {
 	   and preserves the rest. This mask is used to to obtain all flags that
 	   are valid for setting. */
 
-	/*
-	 * FILE_ATTR_DUP_FILE_NAME_INDEX_PRESENT is only present in the
-	 * FILE_NAME attribute (in the field file_attributes).
+	/**
+	 * FILE_ATTR_I30_INDEX_PRESENT - Is it a directory?
+	 *
+	 * This is a copy of the MFT_RECORD_IS_DIRECTORY bit from the mft
+	 * record, telling us whether this is a directory or not, i.e. whether
+	 * it has an index root attribute named "$I30" or not.
+	 * 
+	 * This flag is only present in the FILE_NAME attribute (in the 
+	 * file_attributes field).
+	 */
+	FILE_ATTR_I30_INDEX_PRESENT	= const_cpu_to_le32(0x10000000),
+	
+	/**
+	 * FILE_ATTR_VIEW_INDEX_PRESENT - Does have a non-directory index?
+	 * 
+	 * This is a copy of the MFT_RECORD_IS_VIEW_INDEX bit from the mft
+	 * record, telling us whether this file has a view index present (eg.
+	 * object id index, quota index, one of the security indexes and the
+	 * reparse points index).
+	 *
+	 * This flag is only present in the $STANDARD_INFORMATION and
+	 * $FILE_NAME attributes.
 	 */
-	FILE_ATTR_DUP_FILE_NAME_INDEX_PRESENT	= const_cpu_to_le32(0x10000000),
-	/* This is a copy of the corresponding bit from the mft record, telling
-	   us whether this is a directory or not, i.e. whether it has an
-	   index root attribute or not. */
-	FILE_ATTR_DUP_VIEW_INDEX_PRESENT	= const_cpu_to_le32(0x20000000),
-	/* This is a copy of the corresponding bit from the mft record, telling
-	   us whether this file has a view index present (eg. object id index,
-	   quota index, one of the security indexes or the encrypting file
-	   system related indexes). */
+	FILE_ATTR_VIEW_INDEX_PRESENT	= const_cpu_to_le32(0x20000000),
 } __attribute__((__packed__)) FILE_ATTR_FLAGS;
 
 /*

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsmount.c,1.55,1.56

[Yura P. <cha...@us...>]

Changes by: cha0smaster

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

Modified Files:
	ntfsmount.c 
Log Message:
That was ntfsmount bug with '.' and '..', no need for a workaround.


Index: ntfsmount.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- ntfsmount.c	10 Nov 2005 18:13:16 -0000	1.55
+++ ntfsmount.c	10 Nov 2005 21:26:41 -0000	1.56
@@ -494,7 +494,8 @@ static int ntfs_fuse_filler(ntfs_fuse_fi
 				MREF(mref), strerror(errno));
 		return 0;
 	}
-	if (MREF(mref) >= FILE_first_user || ctx->show_sys_files)
+	if (MREF(mref) == FILE_root || MREF(mref) >= FILE_first_user ||
+			ctx->show_sys_files)
 		fill_ctx->filler(fill_ctx->buf, filename, NULL, 0);
 	free(filename);
 	return 0;
@@ -516,9 +517,6 @@ static int ntfs_fuse_readdir(const char 
 	ni = ntfs_pathname_to_inode(vol, NULL, path);
 	if (!ni)
 		return -errno;
-	if (!strcmp(path, "/"))
-		filler(buf, ".", NULL, 0);
-	filler(buf, "..", NULL, 0);
 	if (ntfs_readdir(ni, &pos, &fill_ctx,
 			(ntfs_filldir_t)ntfs_fuse_filler))
 		err = -errno;

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.c,1.99,1.100

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

Changes by: szaka

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

Modified Files:
	mkntfs.c 
Log Message:
Restore correct V3.1 $AttrDef creation which got last by the recent command 
line parsing rewrite. Thanks to ntfscmp for catching this! :)


Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- mkntfs.c	10 Nov 2005 20:24:07 -0000	1.99
+++ mkntfs.c	10 Nov 2005 20:54:00 -0000	1.100
@@ -4932,8 +4932,13 @@ static int mkntfs_redirect(struct mkntfs
 	g_vol->indx_record_size      = 4096;
 	g_vol->indx_record_size_bits = 12;
 
-	g_vol->attrdef = (ATTR_DEF*)&attrdef_ntfs12_array;
-	g_vol->attrdef_len = sizeof(attrdef_ntfs12_array);
+	if (g_vol->major_ver < 3) {
+		g_vol->attrdef = (ATTR_DEF*)&attrdef_ntfs12_array;
+		g_vol->attrdef_len = sizeof(attrdef_ntfs12_array);
+	} else {
+		g_vol->attrdef = (ATTR_DEF*)&attrdef_ntfs3x_array;
+		g_vol->attrdef_len = sizeof(attrdef_ntfs3x_array);
+	}
 
 	if (mkntfs_open_partition())		/* Open the partition. */
 		goto done;

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.c,1.98,1.99

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

Changes by: szaka

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

Modified Files:
	mkntfs.c 
Log Message:
remove ObjectID creation and all related code: ObjectID's are created and
managed based on (mostly) DLT Service requests, format doesn't care about them


Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- mkntfs.c	10 Nov 2005 05:28:33 -0000	1.98
+++ mkntfs.c	10 Nov 2005 20:24:07 -0000	1.99
@@ -178,7 +178,6 @@ int		   g_mft_bitmap_byte_size = 0;
 u8		  *g_mft_bitmap		  = NULL;
 int		   g_lcn_bitmap_byte_size = 0;
 u8		  *g_lcn_bitmap		  = NULL;
-OBJECT_ID_ATTR	  *g_volume_obj_id	  = NULL;
 runlist		  *g_rl_mft		  = NULL;
 runlist		  *g_rl_mft_bmp		  = NULL;
 runlist		  *g_rl_mftmirr		  = NULL;
@@ -2148,32 +2147,6 @@ static int add_attr_file_name(MFT_RECORD
 }
 
 /**
- * add_attr_object_id
- *
- * add an object_id attribute to the mft record @m
- * return 0 on success or -errno on error
- */
-static int add_attr_object_id(MFT_RECORD *m, OBJECT_ID_ATTR *objid_attr,
-		int objid_attr_len)
-{
-	int err;
-
-	/* Does it fit? NO: create non-resident. YES: create resident. */
-	if (le32_to_cpu(m->bytes_in_use) + 24 + objid_attr_len >
-						le32_to_cpu(m->bytes_allocated))
-		err = insert_non_resident_attr_in_mft_record(m,
-				AT_OBJECT_ID, NULL, 0, 0, 0, (u8*)objid_attr,
-				objid_attr_len);
-	else
-		err = insert_resident_attr_in_mft_record(m,
-				AT_OBJECT_ID, NULL, 0, 0, 0, 0,
-				(u8*)objid_attr, objid_attr_len);
-	if (err < 0)
-		ntfs_log_error("add_attr_volume_id failed: %s\n", strerror(-err));
-	return err;
-}
-
-/**
  * add_attr_sd
  *
  * Create the security descriptor attribute adding the security descriptor @sd
@@ -3075,45 +3048,6 @@ static int initialize_quota(MFT_RECORD *
 }
 
 /**
- * initialize_objid
- *
- * initialize $ObjId with the default index-entries.
- * It is one entry which belongs to $Volume. (W2k3)
- */
-static int initialize_objid(MFT_RECORD *m, GUID guid, const MFT_REF mref)
-{
-	int o_size, err;
-	INDEX_ENTRY *idx_entry_o;
-	OBJ_ID_INDEX_DATA *idx_entry_o_data;
-
-	err = 0;
-	o_size = cpu_to_le32(0x58);
-	idx_entry_o = calloc(1, o_size);
-
-	/* o index entry */
-	idx_entry_o->data_offset = cpu_to_le16(0x20);
-	idx_entry_o->data_length = cpu_to_le16(0x38);
-	idx_entry_o->reservedV = cpu_to_le32(0x00);
-	idx_entry_o->length = cpu_to_le16(0x58);
-	idx_entry_o->key_length = cpu_to_le16(0x10);
-	idx_entry_o->flags = cpu_to_le16(0x00);
-	idx_entry_o->reserved = cpu_to_le16(0x00);
-	idx_entry_o->key.object_id = guid;
-	idx_entry_o_data = (OBJ_ID_INDEX_DATA*)((char*)idx_entry_o
-			+ idx_entry_o->data_offset);
-	idx_entry_o_data->mft_reference = mref;
-	idx_entry_o_data->birth_volume_id = *zero_guid;
-	idx_entry_o_data->birth_object_id = *zero_guid;
-	idx_entry_o_data->domain_id = *zero_guid;
-	err = insert_index_entry_in_res_dir_index(idx_entry_o,
-		o_size, m,
-		NTFS_INDEX_O, 2, AT_UNUSED);
-	free(idx_entry_o);
-
-	return err;
-}
-
-/**
  * insert_file_link_in_dir_index
  *
  * Insert the fully completed FILE_NAME_ATTR @file_name which is inside
@@ -4270,11 +4204,6 @@ static void create_file_volume(MFT_RECOR
 		init_system_file_sd(FILE_Volume, &sd, &i);
 		err = add_attr_sd(m, sd, i);
 	}
-	if (!err && g_vol->major_ver >= 3) {
-		g_volume_obj_id = calloc(1,0x10);
-		ntfs_generate_guid(&g_volume_obj_id->object_id);
-		err = add_attr_object_id(m, g_volume_obj_id, 0x10);
-	}
 	if (!err)
 		err = add_attr_data(m, NULL, 0, 0, 0, NULL, 0);
 	if (!err)
@@ -4919,9 +4848,6 @@ static void mkntfs_create_root_structure
 		if (!err)
 			err = add_attr_index_root(m, "$O", 2, 0, AT_UNUSED,
 				COLLATION_NTOFS_ULONGS, g_vol->indx_record_size);
-		if (!err)
-			err = initialize_objid(m, g_volume_obj_id->object_id,
-				MK_LE_MREF(FILE_Volume, FILE_Volume));
 		if (err < 0)
 			err_exit("Couldn't create $ObjId: %s\n", strerror(-err));
 		ntfs_log_verbose("Creating $Reparse (mft record 26)\n");

[Linux-NTFS-cvs] CVS: ntfsprogs/include/ntfs dir.h,1.14,1.15

[Yura P. <cha...@us...>]

Changes by: cha0smaster

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

Modified Files:
	dir.h 
Log Message:
* implement symblic link creation in ntfs_create
* rename ntfs_create -> __ntfs_create. add wrapers ntfs_create{_symlink,_device}
* ntfsmount: implement .symlink
* ntfsmount: fix readdir to emulate . and .. when needed


Index: dir.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/dir.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- dir.h	8 Nov 2005 16:13:18 -0000	1.14
+++ dir.h	10 Nov 2005 18:13:16 -0000	1.15
@@ -49,9 +49,15 @@ extern ntfs_inode *ntfs_pathname_to_inod
 		const char *pathname);
 
 extern ntfs_inode *ntfs_create(ntfs_inode *dir_ni, ntfschar *name, u8 name_len,
-		dev_t type, dev_t dev);
+		dev_t type);
+extern ntfs_inode *ntfs_create_device(ntfs_inode *dir_ni,
+		ntfschar *name, u8 name_len, dev_t type, dev_t dev);
+extern ntfs_inode *ntfs_create_symlink(ntfs_inode *dir_ni,
+		ntfschar *name, u8 name_len, ntfschar *target, u8 target_len);
+
 extern int ntfs_delete(ntfs_inode *ni, ntfs_inode *dir_ni, ntfschar *name,
 		u8 name_len);
+
 extern int ntfs_link(ntfs_inode *ni, ntfs_inode *dir_ni, ntfschar *name,
 		u8 name_len);