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

[Linux-NTFS-cvs] CVS: linux-ntfs/include bitmap.h,1.4,1.5 bootsect.h,1.4,1.5 disk_io.h,1.5,1.6 endians.h,1.1,1.2 logfile.h,1.5,1.6 ntfs_rec.h,1.4,1.5 support.h,1.2,1.3 unistr.h,1.3,1.4 volume.h,1.8,1.9

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv6878/include

Modified Files:
	bitmap.h bootsect.h disk_io.h endians.h logfile.h ntfs_rec.h 
	support.h unistr.h volume.h 
Log Message:
Added cvs Id header.


Index: bitmap.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/bitmap.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- bitmap.h	2001/04/05 20:14:45	1.4
+++ bitmap.h	2001/04/08 03:02:55	1.5
@@ -1,3 +1,5 @@
 /*
+ * $Id$
+ *
  * bitmap.h - Exports for bitmap handling. Part of the Linux-NTFS project.
  *

Index: bootsect.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/bootsect.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- bootsect.h	2001/03/02 15:03:56	1.4
+++ bootsect.h	2001/04/08 03:02:55	1.5
@@ -1,3 +1,5 @@
 /*
+ * $Id$
+ *
  * bootsect.h - Exports for bootsector record handling. Part of the Linux-NTFS
  *		project.

Index: disk_io.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/disk_io.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -U2 -r1.5 -r1.6
--- disk_io.h	2001/03/26 04:30:27	1.5
+++ disk_io.h	2001/04/08 03:02:55	1.6
@@ -1,3 +1,5 @@
 /*
+ * $Id$
+ *
  * disk_io.h - Exports for disk io. Part of the Linux-NTFS project.
  *

Index: endians.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/endians.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- endians.h	2001/01/24 02:13:24	1.1
+++ endians.h	2001/04/08 03:02:55	1.2
@@ -1,3 +1,5 @@
 /*
+ * $Id$
+ *
  * endians.h - Definitions related to handling of byte ordering. Part of the
  * 	       Linux-NTFS project.

Index: logfile.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/logfile.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -U2 -r1.5 -r1.6
--- logfile.h	2001/03/05 03:15:08	1.5
+++ logfile.h	2001/04/08 03:02:55	1.6
@@ -1,3 +1,5 @@
 /*
+ * $Id$
+ *
  * logfile.h - Exports for $LogFile handling. Part of the Linux-NTFS project.
  *

Index: ntfs_rec.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/ntfs_rec.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- ntfs_rec.h	2001/03/05 02:45:35	1.4
+++ ntfs_rec.h	2001/04/08 03:02:55	1.5
@@ -1,3 +1,5 @@
 /*
+ * $Id$
+ *
  * ntfs_rec.h - Exports for NTFS record handling. Part of the Linux-NTFS
  * 		project.

Index: support.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/support.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- support.h	2001/04/02 02:04:37	1.2
+++ support.h	2001/04/08 03:02:55	1.3
@@ -1,3 +1,5 @@
 /*
+ * $Id$
+ *
  * support.h - Useful definitions and macros. Part of the Linux-NTFS project.
  *

Index: unistr.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/unistr.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -U2 -r1.3 -r1.4
--- unistr.h	2001/04/02 02:04:37	1.3
+++ unistr.h	2001/04/08 03:02:55	1.4
@@ -1,3 +1,5 @@
 /*
+ * $Id$
+ *
  * unistr.h - Exports for unicode string handling. Part of the Linux-NTFS
  *	      project.

Index: volume.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/volume.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -U2 -r1.8 -r1.9
--- volume.h	2001/04/08 01:58:29	1.8
+++ volume.h	2001/04/08 03:02:55	1.9
@@ -1,3 +1,5 @@
 /*
+ * $Id$
+ *
  * volume.h - Exports for NTFS volume handling. Part of the Linux-NTFS project.
  *

[Linux-NTFS-cvs] CVS: linux-ntfs/doc attributes.txt,1.3,1.4 tunable_settings,1.2,1.3

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs/doc
In directory usw-pr-cvs1:/tmp/cvs-serv6878/doc

Modified Files:
	attributes.txt tunable_settings 
Log Message:
Added cvs Id header.


Index: attributes.txt
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/doc/attributes.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -U2 -r1.3 -r1.4
--- attributes.txt	2001/03/26 03:39:59	1.3
+++ attributes.txt	2001/04/08 03:02:55	1.4
@@ -1,2 +1,4 @@
+$Id$
+
 Notes on the storage of attributes.
 ===================================

Index: tunable_settings
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/doc/tunable_settings,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- tunable_settings	2001/03/02 15:04:24	1.2
+++ tunable_settings	2001/04/08 03:02:55	1.3
@@ -14,4 +14,10 @@
 	NtfsMftZoneReservation.
 
+	    Value = Space % of volume reserved for MftZone
+		1 = 12.5%
+		2 = 25%
+		3 = 37.5%
+		4 = 50%
+
 The zone multiplier is ONLY read accessed when mount_volume is called and
 when deallocate_clusters is called.

[Linux-NTFS-cvs] CVS: linux-ntfs/libntfs attrib.c,1.10,1.11 bitmap.c,1.3,1.4 bootsect.c,1.3,1.4 disk_io.c,1.9,1.10 ntfs_rec.c,1.4,1.5 unistr.c,1.3,1.4 volume.c,1.10,1.11

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs/libntfs
In directory usw-pr-cvs1:/tmp/cvs-serv6878/libntfs

Modified Files:
	attrib.c bitmap.c bootsect.c disk_io.c ntfs_rec.c unistr.c 
	volume.c 
Log Message:
Added cvs Id header.


Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/attrib.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -U2 -r1.10 -r1.11
--- attrib.c	2001/04/08 01:58:29	1.10
+++ attrib.c	2001/04/08 03:02:55	1.11
@@ -1,3 +1,5 @@
 /*
+ * $Id$
+ *
  * attrib.c - Attribute handling code. Part of the Linux-NTFS project.
  *

Index: bitmap.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/bitmap.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -U2 -r1.3 -r1.4
--- bitmap.c	2001/04/05 20:14:45	1.3
+++ bitmap.c	2001/04/08 03:02:55	1.4
@@ -1,3 +1,5 @@
 /*
+ * $Id$
+ *
  * bitmap.c - Bitmap handling code. Part of the Linux-NTFS project.
  *

Index: bootsect.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/bootsect.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -U2 -r1.3 -r1.4
--- bootsect.c	2001/03/05 03:04:40	1.3
+++ bootsect.c	2001/04/08 03:02:55	1.4
@@ -1,3 +1,5 @@
 /*
+ * $Id$
+ *
  * bootsect.c - Boot sector handling code. Part of the Linux-NTFS project.
  *

Index: disk_io.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/disk_io.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -U2 -r1.9 -r1.10
--- disk_io.c	2001/04/05 20:14:45	1.9
+++ disk_io.c	2001/04/08 03:02:55	1.10
@@ -1,3 +1,5 @@
 /*
+ * $Id$
+ *
  * disk_io.c - Disk io functions. Part of the Linux-NTFS project.
  *

Index: ntfs_rec.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/ntfs_rec.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- ntfs_rec.c	2001/04/02 02:04:37	1.4
+++ ntfs_rec.c	2001/04/08 03:02:55	1.5
@@ -1,3 +1,5 @@
 /*
+ * $Id$
+ *
  * ntfs_rec.c - NTFS record handling code. Part of the Linux-NTFS project.
  *

Index: unistr.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/unistr.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -U2 -r1.3 -r1.4
--- unistr.c	2001/04/02 02:04:37	1.3
+++ unistr.c	2001/04/08 03:02:55	1.4
@@ -1,3 +1,5 @@
 /*
+ * $Id$
+ *
  * unistr.c - Unicode string handling. Part of the Linux-NTFS project.
  *

Index: volume.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/volume.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -U2 -r1.10 -r1.11
--- volume.c	2001/04/08 01:58:29	1.10
+++ volume.c	2001/04/08 03:02:55	1.11
@@ -1,3 +1,5 @@
 /*
+ * $Id$
+ *
  * volume.c - NTFS volume handling code. Part of the Linux-NTFS project.
  *

[Linux-NTFS-cvs] CVS: linux-ntfs/ntfstools mkntfs.c,1.1,1.2 ntfsdump_logfile.c,1.4,1.5 ntfsfix.c,1.11,1.12

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs/ntfstools
In directory usw-pr-cvs1:/tmp/cvs-serv6878/ntfstools

Modified Files:
	mkntfs.c ntfsdump_logfile.c ntfsfix.c 
Log Message:
Added cvs Id header.


Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/mkntfs.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- mkntfs.c	2001/03/02 15:09:25	1.1
+++ mkntfs.c	2001/04/08 03:02:55	1.2
@@ -2,4 +2,6 @@
 const char *EXEC_VERSION = "0.0.1";
 /*
+ * $Id$
+ *
  * mkntfs - Part of the Linux-NTFS project.
  *

Index: ntfsdump_logfile.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfsdump_logfile.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- ntfsdump_logfile.c	2001/04/02 02:04:37	1.4
+++ ntfsdump_logfile.c	2001/04/08 03:02:55	1.5
@@ -2,7 +2,7 @@
 const char *EXEC_VERSION = "0.0.2";
 /*
- * NtfsDump_LogFile - Part of the Linux-NTFS project.
- *
  * $Id$
+ *
+ * NtfsDump_LogFile - Part of the Linux-NTFS project.
  *
  * Copyright (c) 2000,2001 Anton Altaparmakov.

Index: ntfsfix.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfsfix.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -U2 -r1.11 -r1.12
--- ntfsfix.c	2001/04/02 23:02:41	1.11
+++ ntfsfix.c	2001/04/08 03:02:55	1.12
@@ -1,6 +1,6 @@
 /*
- * NtfsFix - Part of the Linux-NTFS project.
- *
  * $Id$
+ *
+ * NtfsFix - Part of the Linux-NTFS project.
  *
  * Copyright (c) 2000,2001 Anton Altaparmakov.

[Linux-NTFS-cvs] CVS: linux-ntfs/libntfs attrib.c,1.9,1.10 mft.c,1.4,1.5 volume.c,1.9,1.10

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs/libntfs
In directory usw-pr-cvs1:/tmp/cvs-serv3974/libntfs

Modified Files:
	attrib.c mft.c volume.c 
Log Message:
User space conversion of locking complete. I settled for using simple spinlocks
and atomic variables and instead of deadlocking/livelocking when using
spin_lock(), use spin_trylock() in a while letting go of the cpu between each
call and making a maximum of 100 iterations (or we return EDEADLK error code).

This is not the most efficient way, especially as can't have multiple readers
but it is the simplest way to go about things.

Should now have (almost) all required helper functions for dealing with mft
entries implemented.

Now need the file handling and then convert the whole project to use the new
code and then can finally get back to work on attribute searching...


Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/attrib.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -U2 -r1.9 -r1.10
--- attrib.c	2001/04/05 20:14:45	1.9
+++ attrib.c	2001/04/08 01:58:29	1.10
@@ -682,9 +682,12 @@
 		return 0;
 	}
-	errno = 0;
 	do {
-		if (vcn < rl[++i].vcn)
-			return rl[i-1].lcn + (vcn - rl[i-1].vcn);
-	} while (rl[i].length);
+		if (vcn < rl[i+1].vcn) {
+			if (rl[i].lcn == (LCN)-1)
+				return (LCN)-1;
+			errno = 0;
+			return rl[i].lcn + (vcn - rl[i].vcn);
+		}
+	} while (rl[++i].length);
 	errno = ENOENT;
 	return 0;

Index: mft.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/mft.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- mft.c	2001/04/05 20:14:45	1.4
+++ mft.c	2001/04/08 01:58:29	1.5
@@ -37,13 +37,93 @@
 }
 
-void __set_mft_entry_dirty(mft_entry *mentry)
+int flush_mft_entry(const mft_entry *me)
 {
-	ntfs_volume *v = mentry->m_vol;
-	down_write(&mentry->m_sem);
-	down_write(&v->mft_entries_sem);
-        list_add_tail(&mentry->m_dirty_list, &v->dirty_mft_entries);
+	VCN mref;
+	LCN lcn;
+	__u64 ofs;
+	MFT_RECORD *mrec;
+	__u32 i;
+	
+	if (!MftEntryMapped(me))
+		return 0;
+	if (MftEntryError(me))
+		return -EBADF;
+	mref = (VCN)(*(__u64*)me->m_ref & MFT_REFERENCE_MASK_CPU);
+	/* Size of mft record != size of cluster thus need to work with offsets
+	 * into clusters. */
+	if (vol->mft_records_per_cluster) {
+		lcn = vcn_to_lcn(vol->mft_runlist,
+					mref / vol->mft_records_per_cluster);
+		/* FIXME: Change "/" above and "%" below to ">>" and "&"
+		   respectively! */
+		ofs = mref % vol->mft_records_per_cluster;
+		ofs <<= vol->mft_record_size_bits;
+	} else {
+		lcn = vcn_to_lcn(vol->mft_runlist,
+					m * vol->clusters_per_mft_record);
+		/* FIXME: Change "*" above to "<<"! */
+		ofs = 0;
+	}
+	if (!lcn) {
+		if (errno)
+			return -errno;
+		fprintf(stderr, "Linux-NTFS: BUG! flush_mft_entry() tried to "
+				"write to cluster zero!\n");
+		return -EPERM;
+	}
+	if (lcn == -1) {
+		/* It is sparse. This should never happen as we would have
+		 * instantiated it when reading the entry. */
+		fprintf(stderr, "Linux-NTFS: BUG! flush_mft_entry() called on "
+				"sparse mft entry.\n");
+		return -ENOTSUP;
+	}
+	i = 0;
+	while (!spin_trylock(&me->m_rec_lock) && i++ < 100)
+		sched_yield();
+	if (!spin_is_locked(&me->m_rec_lock))
+		return -EDEADLK;
+	i = mst_pwrite(vol->fd, me->m_rec, vol->mft_record_size, 
+					(lcn << vol->cluster_size_bits) + ofs);
+	spin_unlock(&me->m_rec_lock);
+	if (i != vol->mft_record_size) {
+		perror("Linux-NTFS: flush_mft_entry() mst_write() failed");
+		return -EIO;
+	}
+	i = 0;
+	while (!spin_trylock(&me->m_lock) && i++ < 100)
+		sched_yield();
+	if (!spin_is_locked(&me->m_lock))
+		return -EDEADLK;
+	if (!list_empty(&me->m_dirty_list)) {
+		vol->nr_dirty_mft_entries--;
+		list_del_init(&me->m_dirty_list);
+	}
+	ClearMftEntryDirty(me);
+	spin_unlock(&me->m_lock);
+	return 0;
+err_ret_errno:
+	return -errno;
+}
+
+BOOL __set_mft_entry_dirty(mft_entry *me)
+{
+	ntfs_volume *v = me->m_vol;
+	int i = 0;
+	while (!spin_trylock(&me->m_lock) && i++ < 100)
+		sched_yield();
+	if (!spin_is_locked(&me->m_lock))
+		return FALSE;
+	while (!spin_trylock(&v->dirty_mft_entries_lock) && i++ < 100)
+		sched_yield();
+	if (!spin_is_locked(&v->dirty_mft_entries_lock)) {
+		spin_unlock(&me->m_lock);
+		return FALSE;
+	}
+	list_add_tail(&me->m_dirty_list, &v->dirty_mft_entries);
 	v->nr_dirty_mft_entries++;
-	up_write(&v->mft_entries_sem);
-	up_write(&mentry->m_sem);
+	spin_unlock(&v->dirty_mft_entries_lock);
+	spin_unlock(&me->m_lock);
+	return TRUE;
 }
 
@@ -54,6 +134,7 @@
 		return NULL;
 	memset(me, 0, sizeof(mft_entry));
-	init_rwsem(&me->m_rec_sem);
-	init_rwsem(&me->m_sem);
+	spin_lock_init(&me->m_lock);
+	spin_lock_init(&me->m_rec_lock);
+	&me->m_count = ATOMIC_INIT(0);
 	INIT_LIST_HEAD(me->m_list);
 	INIT_LIST_HEAD(me->m_dirty_list);
@@ -63,13 +144,8 @@
 __inline__ int __free_mft_entry(mft_entry *me)
 {
-	down_read(&me->m_sem);
-	if (atomic_read(me->count) || MftEntryDirty(me) || MftEntryMapped(me)) {
-		up_read(&me->m_sem);
+	if (spin_is_locked(&me->m_lock) || atomic_read(me->count) ||
+	    MftEntryDirty(me) || MftEntryMapped(me)) {
 		return -EBUSY;
 	}
-	up_read(&me->m_sem);
-	down_write(&me->m_sem);
-	/* Just making sure nobody else is holding the semaphore... */
-	down_up(&me->m_sem);
 	free(me);
 	return 0;
@@ -105,19 +181,42 @@
 		ofs = 0;
 	}
-	if (lcn < 0)
-		goto err_ret_errno;
-	down_write(&me->m_mrec_sem);
+	if (!lcn) {
+		if (errno)
+			return -errno;
+		fprintf(stderr, "Linux-NTFS: BUG! map_mft_entry() tried to "
+				"read from cluster zero!\n");
+		return -EPERM;
+	}
+	if (lcn == -1) {
+		/* It is sparse. Argh! We now need to instantiate it. */
+		fprintf(stderr, "Linux-NTFS: map_mft_entry() encountered "
+				"sparse mft entry. Not supported yet.\n"
+				"Please email Anton Altaparmakov "
+				"<ai...@ca...> and tell me you got this\n"
+				"error, so I know I have to implement it.\n");
+		return -ENOTSUP;
+	}
+	i = 0;
+	while (!spin_trylock(&me->m_rec_lock) && i++ < 100)
+		sched_yield();
+	if (!spin_is_locked(&me->m_rec_lock))
+		return -EDEADLK;
 	i = mst_pread(vol->fd, (__u8*)mrec, vol->mft_record_size, 1, 
 					(lcn << vol->cluster_size_bits) + ofs);
-	up_write(&me->m_mrec_sem);
+	spin_unlock(&me->m_mrec_lock);
 	if (i != 1) {
+		SetMftEntryError(me);
                 if (i == -1)
 			goto err_ret_errno;
 		return -EIO;
 	}
-	down_write(&me->m_sem);
+	i = 0;
+	while (!spin_trylock(&me->m_lock) && i++ < 100)
+		sched_yield();
+	if (!spin_is_locked(&me->m_lock))
+		return -EDEADLK;
 	me->m_rec = mrec;
 	SetMftEntryMapped(me);
-	up_write(&me->m_sem);
+	spin_unlock(&me->m_lock);
 	return 0;
 err_ret_errno:
@@ -127,79 +226,47 @@
 int __unmap_mft_entry(mft_entry *me)
 {
-	int err;
+	int i;
 
 	if (atomic_read(&me->m_count))
 		return -EBUSY;
-	down_write(&me->m_sem);
-	if (!test_and_clear_bit(ME_mapped, &me->m_flags)) {
-		up_write(&me->m_sem);
+	if (!test_and_clear_bit(ME_mapped, &me->m_flags))
 		return 0;
+	if (MftEntryDirty(me) && (i = flush_mft_entry(me)))
+		goto err_map_ret;
+	i = 0;
+	while (!spin_trylock(&me->m_lock) && i++ < 100)
+		sched_yield();
+	if (!spin_is_locked(&me->m_lock)) {
+		i = -EDEADLK;
+		goto err_map_ret;
 	}
 	if (MftEntryDirty(me)) {
-		if (err = flush_mft_entry(me))
-			goto err_up_ret;
-		if (MftEntryDirty(me)) {
-			err = -EBUSY;
-			goto err_up_ret;
-		}
+		i = -EBUSY;
+		goto err_unl_map_ret;
 	}
-	down_write(&me->m_rec_sem);
-	free(me->m_rec);
-	up_write(&me->m_rec_sem);
-	up_write(&me->m_sem);
-	return 0;
-err_up_ret:
-	up_write(&me->m_sem);
-	return err;
-}
-
-int flush_mft_entry(const mft_entry *me)
-{
-	VCN mref;
-	LCN lcn;
-	__u64 ofs;
-	MFT_RECORD *mrec;
-	__u32 i;
-	
-	if (!MftEntryMapped(me))
-		return 0;
-	mref = (VCN)(*(__u64*)me->m_ref & MFT_REFERENCE_MASK_CPU);
-	/* Size of mft record != size of cluster thus need to work with offsets
-	 * into clusters. */
-	if (vol->mft_records_per_cluster) {
-		lcn = vcn_to_lcn(vol->mft_runlist,
-					mref / vol->mft_records_per_cluster);
-		/* FIXME: Change "/" above and "%" below to ">>" and "&"
-		   respectively! */
-		ofs = mref % vol->mft_records_per_cluster;
-		ofs <<= vol->mft_record_size_bits;
-	} else {
-		lcn = vcn_to_lcn(vol->mft_runlist,
-					m * vol->clusters_per_mft_record);
-		/* FIXME: Change "*" above to "<<"! */
-		ofs = 0;
-	}
-	if (lcn < 0)
-		return -errno;
-	down_write(&me->m_rec_sem);
-	i = mst_pwrite(vol->fd, me->m_rec, vol->mft_record_size, 
-					(lcn << vol->cluster_size_bits) + ofs);
-	up_write(&me->m_rec_sem);
-	if (i != vol->mft_record_size) {
-		if (i == -1)
-			goto err_ret_errno;
-		return -EIO;
+	i = 0;
+	while (!spin_trylock(&me->m_rec_lock) && i++ < 100)
+		sched_yield();
+	if (!spin_is_locked(&me->m_rec_lock)) {
+		i = -EDEADLK;
+		goto err_unl_map_out;
 	}
-	ClearMftEntryDirty(me);
+	free(me->m_rec);
+	spin_unlock(&me->m_rec_lock);
+	spin_unlock(&me->m_lock);
 	return 0;
-err_ret_errno:
-	return -errno;
+err_unl_map_ret:
+	spin_unlock(&me->m_lock);
+err_map_ret:
+	SetMftEntryMapped(me);
+	return i;
 }
 
-int insert_mft_entry(ntfs_volume *vol, mft_entry *me, MFT_REFERENCE mref,
-		MFT_RECORD *mrec, int dirty)
+int insert_mft_entry(ntfs_volume *vol, mft_entry *me, const MFT_REFERENCE mref,
+		     const MFT_RECORD *mrec, const BOOL dirty)
 {
 	struct list_head *tmp;
 	mft_entry *m;
+	int i;
 	
 	*(__u64*)&me->m_ref = mref;
@@ -208,7 +275,13 @@
 		me->m_rec = mrec;
 		SetMftEntryMapped(me);
+		if (dirty)
+			SetMftEntryDirty(me);
 	} else
 		__map_mft_entry(me);
-	down_write(&vol->mft_entries_sem);
+	i = 0;
+	while (!spin_trylock(&vol->mft_entries_lock) && i++ < 100)
+		sched_yield();
+	if (!spin_is_locked(&vol->mft_entries_lock))
+		return -EDEADLK;
 	list_for_each(tmp, &vol->mft_entries) {
 		m = list_entry(tmp, mft_entry, m_list);
@@ -216,21 +289,42 @@
 				(__u64)me->m_ref & MFT_REFERENCE_MASK_CPU)
 			continue;
-		if (m->m_ref == me->m_ref) {
-			up_write(&vol->mft_entries_sem);
-			return -EEXIST; /* BUG()! */
+		if ((__u64)m->m_ref & MFT_REFERENCE_MASK_CPU >
+				(__u64)me->m_ref & MFT_REFERENCE_MASK_CPU) {
+			/* Insert the mft entry in the correct position. */
+			__list_add(&me->m_list, &tmp->m_list->prev,
+						&tmp->m_list);
+			break;
 		}
-		__list_add(&me->m_list, &tmp->m_list->prev, &tmp->m_list);
-		break;
+		spin_unlock(&vol->mft_entries_lock);
+		fprintf(stderr, "Linux-NTFS: BUG! insert_mft_entry(): mft "
+				"entry already present in volume.\n");
+		if (m->m_ref.sequence_number != me->m_ref.sequence_number)
+			fprintf(stderr, "On top of this, the sequence numbers "
+					"are mismatched.\n");
+		return -EEXIST;
 	}
 	vol->nr_mft_entries++;
-	if (mrec && dirty) {
-		down_write(&me->m_sem);
-		SetMftEntryDirty(me);
-	        list_add_tail(&me->m_dirty_list, &vol->dirty_mft_entries);
-		up_write(&me->m_sem);
-		vol->nr_dirty_mft_entries++;
+	spin_unlock(&vol->mft_entries_lock);
+	if (!MftEntryDirty(me))
+		return 0;
+	i = 0;
+	while (!spin_trylock(&vol->dirty_mft_entries_lock) && i++ < 100)
+		sched_yield();
+	if (!spin_is_locked(&vol->dirty_mft_entries_lock))
+		goto try_to_clean_ret;
+	i = 0;
+	while (!spin_trylock(&me->m_lock) && i++ < 100)
+		sched_yield();
+	if (!spin_is_locked(&me->m_lock)) {
+		spin_unlock(&vol->dirty_mft_entries_lock);
+		goto try_to_clean_ret;
 	}
-	up_write(&vol->mft_entries_sem);
+        list_add_tail(&me->m_dirty_list, &vol->dirty_mft_entries);
+	spin_unlock(&me->m_lock);
+	vol->nr_dirty_mft_entries++;
+	spin_unlock(&vol->dirty_mft_entries_lock);
 	return 0;
+try_to_clean_ret:
+	return flush_mft_entry(me);
 }
 
@@ -238,27 +332,48 @@
 {
 	ntfs_volume *vol = me->m_vol;
+	int i, err = 0;
 	
-	if (atomic_read(me->count))
-		return -EBUSY;
 	if (MftEntryDirty(me))
-		flush_mft_entry(me);
-	down_write(&vol->mft_entries_sem);
+		err = flush_mft_entry(me);
+	i = 0;
+	while (!spin_trylock(&me->m_lock) && i++ < 100)
+		sched_yield();
+	if (!spin_is_locked(&me->m_lock))
+		return -EDEADLK;
+	if (MftEntryDirty(me)) {
+		spin_unlock(&me->m_lock);
+		return err < 0 ? err : -EBUSY;
+	}
 	if (atomic_read(me->count)) {
-		up_write(&vol->mft_entries_sem);
+		spin_unlock(&me->m_lock);
 		return -EBUSY;
 	}
+	i = 0;
+	while (!spin_trylock(&me->m_rec_lock) && i++ < 100)
+		sched_yield();
+	if (!spin_is_locked(&me->m_rec_lock)) {
+		spin_unlock(&me->m_lock);
+		return -EDEADLK;
+	}
+	i = 0;
+	while (!spin_trylock(&vol->mft_entries_lock) && i++ < 100)
+		sched_yield();
+	if (!spin_is_locked(&vol->mft_entries_lock)) {
+		spin_unlock(&me->m_rec_lock);
+		spin_unlock(&me->m_lock);
+		return -EDEADLK;
+	}
 	list_del(&me->m_list);
 	vol->nr_mft_entries--;
-	up_write(&vol->mft_entries_sem);
-	down_write(&me->m_rec_sem);
+	spin_unlock(&vol->mft_entries_lock);
 	free(me->m_rec);
-	up_write(&me->m_rec_sem);
-	down_write(&me->m_sem);
-	up_write(&me->m_sem);
+	ClearMftEntryMapped(me);
+	spin_unlock(&me->m_rec_lock);
+	spin_unlock(&me->m_rec);
 	free(me);
 	return 0;
 }
 
-ntfs_file *ntfs_open_by_mref(const ntfs_volume *vol, const MFT_REFERENCE *mref)
+ntfs_file *ntfs_open_by_mref(ntfs_volume *vol, const MFT_REFERENCE *mref)
 {
 	errno = -ENOTSUP;

Index: volume.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/volume.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -U2 -r1.9 -r1.10
--- volume.c	2001/04/05 20:14:45	1.9
+++ volume.c	2001/04/08 01:58:29	1.10
@@ -27,4 +27,5 @@
 #include <unistd.h>
 #include <linux/types.h>
+#include <linux/list.h>
 
 #include "endians.h"
@@ -36,4 +37,25 @@
 #include "support.h"
 
+BOOL ntfs_sync_volume(ntfs_volume *vol)
+{
+	struct list_head *tmp;
+	int i, nr_err;
+
+	i = nr_err = 0;
+	while (!spin_trylock(&vol->dirty_mft_entries_lock) && i++ < 100)
+		sched_yield();
+	if (!spin_is_locked(&vol->dirty_mft_entries_lock))
+		errno = EBUSY;
+		return FALSE;
+	}
+	list_for_each(tmp, &vol->dirty_mft_entries)
+		flush_mft_entry(list_entry(tmp, mft_entry, m_dirty_list));
+	spin_unlock(&vol->dirty_mft_entries_lock);
+	if (!nr_err)
+		return TRUE;
+	errno = EBUSY;
+	return FALSE;
+}
+
 ntfs_volume *ntfs_mount(const char *name)
 {
@@ -189,8 +211,9 @@
 	INIT_LIST_HEAD(vol->closed_files);
 	vol->max_files = 1000;
-	init_rwsem(&vol->files_sem);
+	spin_lock_init(&vol->files_lock);
 	INIT_LIST_HEAD(vol->mft_entries);
 	INIT_LIST_HEAD(vol->dirty_mft_entries);
-	init_rwsem(&vol->mft_entries_sem);
+	spin_lock_init(&vol->mft_entries_lock);
+	spin_lock_init(&vol->dirty_mft_entries_lock);
 	/* Note: No locking needed until we return from this function. */
 	/*if (!(me = __allocate_mft_entry())) {
@@ -510,9 +533,9 @@
 }
 
-int ntfs_umount(ntfs_volume *vol, const int force)
+BOOL ntfs_umount(ntfs_volume *vol, const int force)
 {
 	if (!vol) {
 		errno = EINVAL;
-		return 0;
+		return FALSE;
 	}
 	/* FIXME: Do the cleanup. */
@@ -532,5 +555,5 @@
 		free(vol->upcase);
 	free(vol);
-	return 1;
+	return TRUE;
 }
 

[Linux-NTFS-cvs] CVS: linux-ntfs/include attrib.h,1.22,1.23 mft.h,1.15,1.16 volume.h,1.7,1.8

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv3974/include

Modified Files:
	attrib.h mft.h volume.h 
Log Message:
User space conversion of locking complete. I settled for using simple spinlocks
and atomic variables and instead of deadlocking/livelocking when using
spin_lock(), use spin_trylock() in a while letting go of the cpu between each
call and making a maximum of 100 iterations (or we return EDEADLK error code).

This is not the most efficient way, especially as can't have multiple readers
but it is the simplest way to go about things.

Should now have (almost) all required helper functions for dealing with mft
entries implemented.

Now need the file handling and then convert the whole project to use the new
code and then can finally get back to work on attribute searching...


Index: attrib.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/attrib.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -U2 -r1.22 -r1.23
--- attrib.h	2001/04/05 20:14:45	1.22
+++ attrib.h	2001/04/08 01:58:29	1.23
@@ -1710,8 +1710,7 @@
  * 	
  * 	0: Check errno:
- * 		If zero, the lcn corresponding to the vcn is zero.
- * 		Otherwise, there was an error and errno contains the error code,
- * 		the most interesting error being ENOENT indicating we are
- * 		looking for a vcn which doesn't exist.
+ * 		0	The lcn corresponding to the vcn is really zero.
+ *		ENOENT	We are looking for a vcn which doesn't exist.
+ * 		EINVAL	Either @rl or @vcn are invalid.
  * 		
  *	-1: The lcn is sparse, i.e. it's contents are zero and there is no disk

Index: mft.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/mft.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -U2 -r1.15 -r1.16
--- mft.h	2001/04/05 20:14:45	1.15
+++ mft.h	2001/04/08 01:58:29	1.16
@@ -30,5 +30,5 @@
 
 #include <asm/atomic.h>
-#include <asm/semaphore.h>
+#include <linux/spinlock.h>
 #include <linux/list.h>
 
@@ -36,4 +36,5 @@
 #include "ntfs_rec.h"
 #include "volume.h"
+#include "support.h"
 
 #define is_mft_record(x)	( is_file_record(x) )
@@ -149,4 +150,6 @@
 	} __attribute__ ((__packed__));
 	__u64 full_ref;				/* Mft reference as one value.*/
+	__u64;					/* Unnamed reference as one
+						   value. */
 } __attribute__ ((__packed__)) MFT_REFERENCE;
 
@@ -268,5 +271,5 @@
  * max_files:		Maximum number of nr_open_files + nr_closed_files.
  * 
- * files_sem:		Read write semaphore to serialize access to the above
+ * files_lock:		Spinlock to serialize access to the above
  * 			structure members (open_files, nr_open_files,
  * 			closed_files, nr_closed_files and max_files).
@@ -289,4 +292,7 @@
  * nr_mft_entries:	Number of mft_entries.
  *
+ * mft_entries_lock:	Spinlock to serialize access to
+ *			{nr_}mft_entries.
+ *
  * dirty_mft_entries:	Linked list of all loaded mft records which are dirty.
  * 			Used by the disk writer thread. When a mft_entry is
@@ -297,7 +303,6 @@
  * nr_dirty_mft_entries:	Number of dirty mft_entries.
  *
- * mft_entries_sem:	Read write semaphore to serialize access to the above
- * 			structure members (mft_entries, nr_mft_entries and their
- * 			dirty equivalents).
+ * dirty_mft_entries_lock:	Spinlock to serialize access to
+ * 				{nr_}dirty_mft_entries.
  *
  * The mft_entry struct.
@@ -310,5 +315,5 @@
  * 		set.)
  * 
- * m_rec_sem:	Read write semaphore controlling access to m_rec. Only one
+ * m_rec_lock:	Spinlock controlling access to m_rec. Only one
  * 		writer at a time (and no readers while one writer) as the mft
  * 		record will be corrupt during the write	process.
@@ -316,9 +321,13 @@
  * m_flags:	Atomic flags describing the mft entry / record:
  * 
- * 	mapped:		Is the MFT_RECORD actually in memory? (Is mrec valid?)
+ * 	mapped:	Is the MFT_RECORD actually in memory? (Is mrec valid?)
  *
- * 	dirty:		Does the record need to be written to disk? (If not, it
- * 			is safe to discard m_rec, but only if m_count is zero
- * 			and we are holding m_rec_sem for writing.)
+ * 	dirty:	Does the record need to be written to disk? (If not, it is safe
+ * 		to discard m_rec, but only if m_count is zero and we are
+ * 		holding m_rec_lock for writing.)
+ *
+ * 	error:	When reading the entry from disk it was detected that it is
+ * 		corrupt. For example, it could be that a multi sector transfer
+ * 		error was detected.
  *
  * m_ref:	Mft reference of the mft record described by this entry. (This
@@ -329,9 +338,9 @@
  * 		first if dirty flag is set).
  * 
- * m_sem:	Read write semaphore controlling access to this entry.
+ * m_lock:	Lock controlling access to this entry.
  *
- * m_list:	Hook for the mft_entries linked list.
+ * m_list:	Anchor for the mft_entries linked list.
  *
- * m_dirty_list: Hook for the dirty_mft_enties linked list. (Only valid if
+ * m_dirty_list: Anchor for the dirty_mft_enties linked list. (Only valid if
  *		the dirty flag is set.)
  * 
@@ -371,5 +380,5 @@
  * 		a possible f_nr_mft_entries, but refs is shorter to write. (-;
  *
- * f_sem:	Read write semaphore for serializing access to the above struct
+ * f_lock:	Spinlock for serializing access to the above struct
  * 		members (f_mft_refs, f_mft_entries and f_nr_mft_refs).
  *
@@ -379,5 +388,5 @@
  * 		below the idea of files.
  *
- * f_list:	Hook into vol->open/closed_files list.
+ * f_list:	Anchor into vol->open/closed_files list.
  * 
  * Notes:
@@ -392,5 +401,6 @@
 #define ME_mapped	0
 #define ME_dirty	1
-			/* bits 2-31 reserved for future use */
+#define ME_error	2
+			/* bits 3-31 reserved for future use */
 
 #define MftEntryMapped(me)		test_bit(ME_mapped, &(me)->m_flags)
@@ -402,11 +412,15 @@
 #define ClearMftEntryDirty(me)		clear_bit(ME_dirty, &(me)->m_flags)
 
+#define MftEntryError(me)		test_bit(ME_error, &(me)->m_flags)
+#define SetMftEntryError(me)		set_bit(ME_error, &(me)->m_flags)
+#define ClearMftEntryError(me)		clear_bit(ME_error, &(me)->m_flags)
+
 typedef struct {
 	MFT_RECORD *m_rec;
-	struct rw_semaphore m_rec_sem;
+	struct spinlock_t m_rec_lock;
  	unsigned int m_flags;
 	MFT_REFERENCE m_ref;
  	atomic_t m_count;
-	struct rw_semaphore m_sem;
+	struct spinlock_t m_lock;
  	struct list_head m_list;
 	struct list_head m_dirty_list;
@@ -414,17 +428,9 @@
 } mft_entry;
 
-void __set_mft_entry_dirty(mft_entry *me);
-
-static __inline__ void set_mft_entry_dirty(mft_entry *me)
-{
-	if (!test_and_set_bit(ME_dirty, &me->m_flags))
-		__set_mft_entry_dirty(me);
-}
-
 typedef struct {
 	MFT_REFERENCE *f_mft_refs;
 	mft_entry *f_mft_entries;
 	int f_nr_mft_refs;
-	struct rw_semaphore f_sem;
+	struct spinlock_t f_lock;
 	atomic_t f_count;
 	struct list_head f_list;
@@ -432,49 +438,83 @@
 
 /**
- * __allocate_mft_entry - allocate a new mft_entry and initialize it
+ * flush_mft_entry - flush a mft_entry to disk
+ * @me:		mft_entry to flush
+ * 
+ * The mft entry is written to disk (if dirty) and marked clean. It is also
+ * removed from the dirty list of the volume (if it is on the list).
  *
- * Return the new mft_entry on success or NULL with errno set to the error code.
+ * This function must be called with the volume's dirty_mft_entries_lock held,
+ * if the entry is on the volume's mft_entries_dirty list. If it is not, the
+ * lock doesn't need to be held.
+ * 
+ * Return 0 on success and -ERRNO on error. Following failure return values
+ * are defined:
+ * 	-EBADF		Mft_entry is corrupt (error flag set).
+ * 	-EDEADLK	Couldn't acquire a necessary lock.
+ * 	-EIO		Writing to disk failed.
+ * 	-ENOTSUP	Tried to write to a sparse mft record. Should never
+ * 			happen but if it does there is a bug. See implementation
+ * 			of flush_mft_entry() in mft.c for details.
+ * 	-EPERM		Tried to write to cluster 0, which would overwrite the
+ * 			bootsector. There must be a bug somewhere...
+ * 	others		Error codes returned by vcn_to_lcn() function; meaning
+ * 			we couldn't locate the position on disk for the entry.
  */
-extern __inline__ mft_entry *__allocate_mft_entry(void);
+int flush_mft_entry(mft_entry *me);
 
 /**
- * free_mft_entry - free a mft_entry
- * @me:		mft_entry to free
+ * __set_mft_entry_dirty - internal use only, use set_mft_entry_dirty instead
+ * @me:		mft entry to set dirty
+ *
+ * Return true on success or false if one of the locks couldn't be acquired.
  * 
- * Must be unlocked, use count 0, etc, or we return -EBUSY.
- * Return 0 on success and -ERRNO on error.
+ * See set_mft_entry_dirty().
  */
-extern __inline__ int free_mft_entry(mft_entry *me);
+BOOL __set_mft_entry_dirty(mft_entry *me);
 
 /**
- * insert_mft_entry - insert a mft_entry in a volume
- * @vol:	volume to insert into
- * @me:		mft_entry to insert
- * @mref:	mft reference the mft entry will have
- * @mrec:	optional loaded MFT_RECORD corresponding to @mref
- * @dirty:	boolean whether @mrec is dirty or not (only if @mrec present)
- * 
- * Initialize the mft_entry with the values of @mref, @mrec and @dirty and
- * insert it into the volume @vol. If @mrec is not present, the mft record
- * corresponding to @mref is loaded from the volume.
+ * set_mft_entry_dirty - set an mft entry dirty
+ * @me:		mft entry to set dirty
  *
- * Return 0 on success and -ERRNO on error.
+ * If the mft entry @me is not dirty it is added to the dirty_mft_entries list
+ * of the volume to which @me belongs and the dirty flag of the entry is set.
+ *
+ * Return true on success or false on error.
+ *
+ * If setting the mft entry dirty fails, we try to flush it to disk and make
+ * it clean to avoid problems. If this succeeds, return true, and not false.
+ *
+ * If false is returned, this means that we couldn't set the mft entry dirty
+ * and we also couldn't flush it to disk to make it clean again. This means
+ * that the caller has to make sure that the contents are not lost, which they
+ * would be normally, unless a subsequent call to set_mft_entry_dirty() or
+ * flush_mft_entry() succeeds.
  */
-int insert_mft_entry(ntfs_volume *vol, mft_entry *me, MFT_REFERENCE mref,
-		     MFT_RECORD *mrec, int dirty);
+static __inline__ BOOL set_mft_entry_dirty(mft_entry *me)
+{
+	if (test_and_set_bit(ME_dirty, &me->m_flags) ||
+	    __set_mft_entry_dirty(me))
+		return TRUE;
+	return flush_mft_entry(me) == 0;
+}
 
 /**
- * remove_mft_entry - remove a mft_entry from it's volume and free it
- * @me:		mft_entry to remove and free
- * 
- * The mft entry must have a use count of 0, or we return -EBUSY.
+ * __allocate_mft_entry - allocate a new mft_entry and initialize it
+ *
+ * Return the new mft_entry on success or NULL with errno set to the error
+ * code returned from malloc().
+ */
+extern __inline__ mft_entry *__allocate_mft_entry(void);
+
+/**
+ * __free_mft_entry - free a mft_entry
+ * @me:		mft_entry to free
  * 
- * Remove the mft entry from the volume, flush it to disk if necessary,
- * and finally free all memory that was used by the entry including the entry
- * itself.
+ * Return 0 on success and -EBUSY on error.
  * 
- * Return 0 on success and -ERRNO on error.
+ * To succeed, the entry must be unlocked, clean, have a use count of 0, and
+ * it must not be mapped. If any of these are false, return -EBUSY.
  */
-int remove_mft_entry(mft_entry *me);
+extern __inline__ int __free_mft_entry(mft_entry *me);
 
 /**
@@ -482,7 +522,21 @@
  * @me:		mft entry to map
  *
- * Map an (unmapped) mft entry into memory not increasing the use count.
+ * Map mft entry @me into memory (if unmapped) not increasing the use count.
  * 
- * Return 0 on success or -ERRNO on error.
+ * Return 0 on success or -ERRNO on error. If an I/O error of any kind occurs,
+ * including multi sector transfer (mst) errors being detected, the error flag
+ * is set on the entry.
+ * 
+ * Following failure return values are defined:
+ * 	-EDEADLK	Couldn't acquire a necessary lock.
+ * 	-EIO		Reading from disk failed (or mst error detected). Error
+ * 			flag has been set.
+ * 	-ENOTSUP	Tried to read a sparse mft record. Currently not
+ * 			implemented as I am not sure whether this can ever
+ * 			occur.
+ * 	-EPERM		Tried to read cluster 0, which would return the
+ * 			bootsector data. There must be a bug somewhere...
+ * 	others		Error codes returned by vcn_to_lcn() function; meaning
+ * 			we couldn't locate the position on disk for the entry.
  */
 int __map_mft_entry(mft_entry *me);
@@ -492,7 +546,9 @@
  * @me:		mft entry to map
  *
- * Map an (unmapped) mft entry into memory and increase the use count.
+ * Increase the use count of the entry @me and map it into memory (if it is not
+ * mapped).
  *
- * Return 0 on success or -ERRNO on error.
+ * Return 0 on success or -ERRNO on error. See __map_mft_entry() for more
+ * details on the returned error codes.
  */
 static __inline__ int map_mft_entry(mft_entry *me)
@@ -523,47 +579,79 @@
  * @me:		mft entry to unmap
  *
- * Actually unmap the mft entry (only if use count is 0).
+ * Unmap the mft entry (only if use count is 0) and free all used memory.
  *
- * Return zero on success or -ERRNO on error.
+ * Return zero on success or -ERRNO on error. On error, the following values
+ * are returned:
+ * 	-EBUSY		Use count is above zero or couldn't sync dirty entry.
+ * 	-EDEADLK	Failed to acquire a necessary lock.
+ * 	others		Values returned by flush_mft_entry().
  */
 int __unmap_mft_entry(mft_entry *me);
 
 /**
- * flush_mft_entry - flush a mft_entry to disk
- * @me:		mft_entry to flush
+ * insert_mft_entry - insert a mft_entry into a volume
+ * @vol:	volume to insert into
+ * @me:		mft_entry to insert
+ * @mref:	mft reference the mft entry will have
+ * @mrec:	loaded MFT_RECORD corresponding to @mref (optional)
+ * @dirty:	true if @mrec is dirty, false otherwise (only if @mrec present)
  * 
- * The mft entry is written to disk (if dirty) and marked clean. It is also
- * removed from the dirty list of the volume.
+ * Initialize the mft_entry with the values of @mref, @mrec and @dirty and
+ * insert it into the volume @vol. If @mrec is not present, the mft record
+ * corresponding to @mref is loaded from the volume.
+ *
+ * Return 0 on success and -ERRNO on error. On error, the following values are
+ * returned:
+ * 	-EDEADLK	Failed to acquire a necessary lock.
+ * 	-EEXIST		Entry alread exists in the volume. There must be a bug
+ * 			somewhere. This should _really_ never happen.
+ * 	others		Values returned by flush_mft_entry.
+ */
+int insert_mft_entry(ntfs_volume *vol, mft_entry *me, const MFT_REFERENCE mref,
+		     const MFT_RECORD *mrec, const BOOL dirty);
+
+/**
+ * remove_mft_entry - remove a mft_entry from its volume and free it
+ * @me:		mft_entry to remove and free
+ * 
+ * Remove the mft entry @me from its volume, flush it to disk if necessary,
+ * and finally free all memory that was used by the entry including the entry
+ * itself. Note, the mft entry must have a use count of zero.
  * 
- * Return 0 on success and -ERRNO on error.
+ * Return 0 on success and -ERRNO on error. The defined error codes are:
+ * 	-EBUSY		The use count of the entry is above 0.
+ * 	-EDEADLK	Failed to acquire a necessary lock.
+ * 	others		Values returned by flush_mft_entry.
  */
-int flush_mft_entry(mft_entry *me);
+int remove_mft_entry(mft_entry *me);
 
 /**
- * ntfs_open_by_mref - open an ntfs file, i.e. mft record, given a mft reference
+ * ntfs_open_by_mref - open an ntfs file (mft record), given its mft reference
  * @vol:	ntfs volume to operate on
  * @mref:	mft_reference of base mft record to open
  *
  * Open an ntfs_file (using file to mean any base mft record) given the mft
- * reference of the mft record (i.e. the inode number). To do this allocate an
+ * reference of the mft record (i.e. the inode number). To do this, allocate an
  * ntfs_file structure (adding it to the vol->open_files array), or if the file
  * is already loaded, just find it in the vol->open_/closed_files arrays.
  *
- * Return a pointer to the ntfs_file structure in the vol->open_files array.
+ * Return a pointer to the ntfs_file structure in the vol->open_files array or
+ * NULL on error with errno containing the error code.
+ * 
  * This pointer should be treated completely opaquely by the user! Never
  * use it for anything except as a parameter to functions taking a ntfs_file
  * pointer as a parameter.
  */
-ntfs_file *ntfs_open_by_mref(const ntfs_volume *vol, const MFT_REFERENCE *mref);
+ntfs_file *ntfs_open_by_mref(ntfs_volume *vol, const MFT_REFERENCE *mref);
 
 /**
  * ntfs_close - close an ntfs_file
  * @vol:	ntfs volume to operate on
- * @fref:	ntfs_file pointer to close
+ * @f:		ntfs_file pointer to close
  *
- * Close a previously opened ntfs file. Return zero on success or -1 on
- * error, where errno is the error number.
+ * Close a previously opened ntfs file. Return zero on success or -ERRNO on
+ * error.
  */
-int ntfs_close(ntfs_file *fref);
+int ntfs_close(ntfs_file *f);
 
 #endif /* defined MFT_H */

Index: volume.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/volume.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -U2 -r1.7 -r1.8
--- volume.h	2001/04/07 17:30:10	1.7
+++ volume.h	2001/04/08 01:58:29	1.8
@@ -25,8 +25,9 @@
 #include <stdio.h>
 #include <asm/atomic.h>
-#include <asm/semaphore.h>
+#include <linux/spinlock.h>
 #include <linux/list.h>
 
 #include "attrib.h"
+#include "support.h"
 
 /*
@@ -109,5 +110,5 @@
 					   files which are not open any more. */	int nr_closed_files;		/* Number of closed files. */
 	int max_files;			/* Maximum number of nr_open_files + nr_					   closed_files. */
-	rw_semaphore files_sem;		/* Read write semaphore to serialize
+	spinlock_t files_lock;		/* Spinlock to serialize
 					   access to open_files, nr_open_files,
 					   closed_files, nr_closed_files and
@@ -120,21 +121,35 @@
 					   struct pointers. */
 	int nr_mft_entries;		/* Number of mft_entries. */
+	spinlock_t mft_entries_lock;	/* Spinlock to serialize
+					   access to {nr_}mft_entries. */
  	struct list_head dirty_mft_entries; /* Linked list of all loaded mft
-					   records which are dirty. */
- 	int nr_dirty_mft_entries;	/* Number of dirty mft_entries. */
-	rw_semaphore mft_entries_sem;	/* Read write semaphore to serialize
-					   access to mft_entries,
-					   nr_mft_entries and their dirty
-					   equivalents. */
-	struct list_head v_list;	/* Anchor for list of all mounted
-					   volumes. */
+					       records which are dirty. */
+ 	int nr_dirty_mft_entries;	    /* Number of dirty mft_entries. */
+	spinlock_t dirty_mft_entries_lock;  /* Spinlock to serialize access to
+					       {nr_}dirty_mft_entries. */
+	struct list_head v_list;	    /* Anchor for list of all mounted
+					       volumes. */
 } ntfs_volume;
 
 /**
+ * ntfs_sync_volume - sync a mounted ntfs volume to physical storage
+ * @vol:	ntfs volume to sync
+ *
+ * This function syncs a mounted ntfs volumes to physical storage.
+ *
+ * Returns true on success or false on error. In the later case errno describes
+ * the error.
+ *
+ * The important error codes are:
+ * 	TODO: List them... (AIA)
+ */
+BOOL ntfs_sync_volume(ntfs_volume *vol);
+
+/**
  * ntfs_mount - open ntfs volume
  * @name: name of device/file to open
  *
- * This function opens an ntfs volume. @name should contain the name of the
- * device/file to open as the ntfs volume.
+ * This function mounts an ntfs volume. @name should contain the name of the
+ * device/file to mount as the ntfs volume.
  * 
  * The function opens the device or file @name and verifies that it contains a
@@ -163,6 +178,6 @@
  * itself) associated with the ntfs volume @vol.
  *
- * Return 1 on success. On error return zero with errno set appropriately (most
- * likely to one of -EAGAIN, -EBUSY or -EINVAL). The -EAGAIN error means that
+ * Return true on success. On error return false with errno set appropriately
+ * (most likely to one of EAGAIN, EBUSY or EINVAL). The EAGAIN error means that
  * an operation is in progress and if you try the close later the operation
  * might be completed and the close succeed.
@@ -181,5 +196,5 @@
  * means.
  */
-int ntfs_umount(ntfs_volume *vol, const int force);
+BOOL ntfs_umount(ntfs_volume *vol, const int force);
 
 #endif /* defined VOLUME_H */

[Linux-NTFS-cvs] CVS: linux-ntfs/include ntfsd.h,1.4,1.5 volume.h,1.6,1.7

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv535

Modified Files:
	ntfsd.h volume.h 
Log Message:
ntfsd should be finished now


Index: ntfsd.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/ntfsd.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- ntfsd.h	2001/04/07 14:46:14	1.4
+++ ntfsd.h	2001/04/07 17:30:10	1.5
@@ -27,7 +27,9 @@
 #include <linux/bitops.h>
 #include <linux/spinlock.h>
+#include <linux/list.h>
 #include <asm/atomic.h>
 
 #include "volume.h"
+#include "support.h"
 
 /*
@@ -35,7 +37,7 @@
  * walk the dirty list for each mounted volume.
  */
-extern ntfs_volume *mounted_volumes;
-extern int nr_mounted_volumes;
-extern spinlock_t mounted_volumes_lock;
+extern struct listhead ntfs_mounted_volumes;
+extern int nr_ntfs_mounted_volumes;
+extern spinlock_t ntfs_mounted_volumes_lock;
 
 /*
@@ -90,5 +92,5 @@
  *	others - Other error codes returned by one of the system calls.
  */
-int ntfsd_start(void);
+BOOL ntfsd_start(void);
 
 /**
@@ -125,5 +127,5 @@
  *	others - Other error codes returned by one of the system calls.
  */
-int ntfsd_stop(void);
+BOOL ntfsd_stop(void);
 
 #endif /* defined NTFSD_H */

Index: volume.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/volume.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -U2 -r1.6 -r1.7
--- volume.h	2001/04/03 22:41:30	1.6
+++ volume.h	2001/04/07 17:30:10	1.7
@@ -127,4 +127,6 @@
 					   nr_mft_entries and their dirty
 					   equivalents. */
+	struct list_head v_list;	/* Anchor for list of all mounted
+					   volumes. */
 } ntfs_volume;
 

[Linux-NTFS-cvs] CVS: linux-ntfs/libntfs ntfsd.c,1.2,1.3

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs/libntfs
In directory usw-pr-cvs1:/tmp/cvs-serv473

Modified Files:
	ntfsd.c 
Log Message:
ntfsd should be finished now


Index: ntfsd.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/ntfsd.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- ntfsd.c	2001/04/07 00:53:38	1.2
+++ ntfsd.c	2001/04/07 17:29:41	1.3
@@ -22,5 +22,4 @@
  */
 
-#include <linux/bitops.h>
 #include <sys/time.h>
 #include <signal.h>
@@ -28,29 +27,91 @@
 #include <stdio.h>
 #include <errno.h>
+#include <sched.h>
 
 #include "ntfsd.h"
-#include "support.h"
 
+/*
+ * Keep track of mounted volumes so we can walk the list and sync them all.
+ */
+LISTHEAD(ntfs_mounted_volumes);
+atomic_t nr_ntfs_mounted_volumes = 0;
+spinlock_t ntfs_mounted_volumes_lock = SPIN_LOCK_UNLOCKED;
+
+/*
+ * Global flags describing ntfsd state.
+ */
+int ntfsd_flags = 0;
+static atomic_t ntfsd_times_started = ATOMIC_INIT(0);
+
+/*
+ * We need this global to preserve the old sigalrm_action between calls to
+ * ntfsd_start() and ntfsd_stop().
+ */
+static struct sigaction ntfsd_old_sigalrm_action;
+
+/* Convenience strings. */
+static const char *ntfsd_internal_error = "Internal error.";
+static const char *ntfsd_sigalrm_not_supported = "The system does not support "
+						 "the SIGALRM signal.";
+
+/*
+ * The ntfsd daemon / thread which syncs all volumes everytime it is called.
+ * (Every 5 seconds.)
+ */
 static void ntfsd_thread(int i)
 {
+	int i, j, t;
+	struct list_head *tmp;
+	ntfs_volume *vol;
+	
 	if (!NtfsdStarted(ntfsd_flags) ||
 	    test_and_set_bit(NTFSD_running, &ntfsd_flags))
 		return;
-	// TODO: Sync all volumes.
+	if (atomic_read(&nr_ntfs_mounted_volumes) <= 0) {
+		goto unl_ret;
+	i = 0;
+	while (!spin_trylock(&ntfs_mounted_volumes_lock) && i++ < 100)
+		sched_yield();
+	if (!spin_is_locked(&ntfs_mounted_volumes_lock))
+		goto unl_ret;
+	list_for_each(tmp, &ntfs_mounted_volumes) {
+		vol = list_entry(tmp, ntfs_volume, v_list);
+		i = j = t = 0;
+repeat_sync:
+		if (!ntfs_sync_volume(vol)) {
+			switch (errno) {
+			case EBUSY:
+				if (j++ < 100 && t++ < 1000) {
+					i = 0;
+					sched_yield();
+					goto repeat_sync;
+				}
+				break;
+			case EINTR:
+			case EAGAIN:
+				if (i++ < 3 && t++ < 1000) {
+					j = 0;
+					goto repeat_sync;
+				}
+				break;
+			}
+			fprintf(stderr, "Linux-NTFS: ntfsd: sync_volume() "
+					"failed for volume %s (%s): %s",
+					vol->vol_name, vol->dev_name,
+					strerror(errno));
+		}
+	}
+	spin_unlock(&ntfs_mounted_volumes_lock);
+unl_ret:
 	ClearNtfsdRunning(ntfsd_flags);
 	return;
 }
 
-static struct sigaction ntfsd_old_sigalrm_action;
-
-static const char *ntfsd_internal_error = "Internal error.";
-static const char *ntfsd_sigalrm_not_supported = "The system does not support "
-						 "the SIGALRM signal.";
-
-int ntfsd_start()
+BOOL ntfsd_start(void)
 {	
+	int tries, err;
 	const char *ntfsd_start_error = "Linux-NTFS: failed to start ntfsd.";
-	struct sigaction act;
-	int tries;
+	struct sigaction action;
+	struct itimerval timer_val;
 
 	if (test_and_set_bit(NTFSD_busy, &ntfsd_flags)) {
@@ -58,65 +119,105 @@
 		return FALSE;
 	}
-	if (test_and_set_bit(NTFSD_started, &ntfsd_flags)) {
-unl_ret_true:
-		ClearNtfsdBusy(ntfsd_flags);
-		return TRUE;
+	if (atomic_inc_and_test(&ntfsd_times_started)) {
+		fprinf(stderr, "Linux-NTFS: ntfsd started counter "
+			       "would overflow. Not starting.\n");
+		atomic_dec(&ntfsd_times_started);
+		errno = EMFILE;
+		return FALSE;
 	}
+	if (NtfsdStarted(ntfsd_flags))
+		goto unl_ret_true;
 	memset(&ntfsd_old_sigalrm_action, 0, sizeof(struct sigaction));
 	tries = 0;
 retry_get_action:
-	if (sigaction(SIGALRM, NULL, &act)) {
-		int e = errno;
-		switch (e) {
-		case EFAULT:
-			fprintf(stderr, "%s %s\n", ntfsd_start_error,
-					ntfsd_internal_error);
+	if (sigaction(SIGALRM, NULL, &action)) {
+		switch (err = errno) {
+		case EINTR:
+			if (tries++ < 2)
+				goto retry_get_action;
+			perror(ntfsd_start_error);
 			break;
 		case EINVAL:
 			fprintf(stderr, "%s %s\n", ntfsd_start_error,
 					ntfsd_sigalrm_not_supported);
+			err = ENOTSUP;
 			break;
-		case EINTR:
-			if (tries++ < 2)
-				goto retry_get_action;
-			/* else fall through to default. */
+		case EFAULT:
+			fprintf(stderr, "%s %s\n", ntfsd_start_error,
+					ntfsd_internal_error);
+			break;
 		default:
 			perror(ntfsd_start_error);
+			err = EFAULT;
 		}
-		errno = e;
-		return FALSE;
+		goto unl_ret_false;
 	}
-	if (act.sa_handler == &ntfsd_thread)
+	if (action.sa_handler == &ntfsd_thread)
 		goto unl_ret_true;
-	memset(&act, 0, sizeof(struct sigaction));
+	memset(&action, 0, sizeof(struct sigaction));
 	tries = 0;
 retry_set_action:
-	act.sa_handler = &ntfsd_thread;
-	if (sigaction(SIGALRM, &act, &ntfsd_old_sigalrm_action)) {
-		int e = errno;
-		switch (e) {
+	action.sa_handler = &ntfsd_thread;
+	if (sigaction(SIGALRM, &action, &ntfsd_old_sigalrm_action)) {
+		switch (err = errno) {
+		case EINTR:
+			if (tries++ < 2)
+				goto retry_set_action;
+			perror(ntfsd_start_error);
+			break;
+		case EINVAL:
+			fprintf(stderr, "%s %s\n", ntfsd_start_error,
+					ntfsd_sigalrm_not_supported);
+			err = ENOTSUP;
+			break;
 		case EFAULT:
 			fprintf(stderr, "%s %s\n", ntfsd_start_error,
 					ntfsd_internal_error);
 			break;
-		case EINTR:
-			if (tries++ < 2)
-				goto retry_set_action;
-			/* else fall through to default. */
 		default:
 			perror(ntfsd_start_error);
+			err = EFAULT;
 		}
-		errno = e;
-		return FALSE;
+		goto unl_ret_false;
 	}
-	// Set the timer.
-	goto unl_ret_true;
+	memset(&timer_val, 0, sizeof(struct itimerval));
+	timer_val.it_interval.tv_sec = 5;
+	timer_val.it_value.tv_sec = 5;
+	if (setitimer(ITIMER_REAL, &timer_val, NULL)) {
+		switch (errno) {
+		case EINVAL:
+		case EFAULT:
+			fprintf(stderr, "%s %s\n", ntfsd_start_error,
+					ntfsd_internal_error);
+			break;
+		default:
+			perror(ntfsd_start_error);
+		}
+		err = EFAULT;
+		tries = 0;
+retry_reset_action:
+		if (sigaction(SIGALRM, &ntfsd_old_sigalrm_action, NULL)) {
+			if (errno == EINTR && tries++ < 2)
+				goto retry_reset_action;
+			err = ECANCELED;
+		}
+		goto unl_ret_false;
+	}
+	SetNtfsdStarted(ntfsd_flags);
+unl_ret_true:
+	ClearNtfsdBusy(ntfsd_flags);
+	return TRUE;
+unl_ret_false:
+	atomic_dec(&ntfsd_times_started);
+	ClearNtfsdBusy(ntfsd_flags);
+	errno = err;
+	return FALSE;
 }
 
-int ntfsd_stop()
+BOOL ntfsd_stop(void)
 {
+	int tries, err;
 	const char *ntfsd_stop_error = "Linux-NTFS: failed to stop ntfsd.";
-	struct sigaction act;
-	int tries;
+	struct itimerval timer_val;
 
 	if (test_and_set_bit(NTFSD_busy, &ntfsd_flags)) {
@@ -124,30 +225,65 @@
 		return FALSE;
 	}
-	if (!test_and_clear_bit(NTFSD_started, &ntfsd_flags)) {
-unl_ret_true:
-		ClearNtfsdBusy(ntfsd_flags);
-		return TRUE;
+	if (atomic_read(&ntfsd_times_started) > 0 &&
+	    !atomic_dec_and_test(&ntfsd_times_started))
+		goto unl_ret_true;
+	atomic_set(&ntfsd_times_started, 0);
+	if (!test_and_clear_bit(NTFSD_started, &ntfsd_flags))
+		goto unl_ret_true;
+	memset(&timer_val, 0, sizeof(struct itimerval));
+	timer_val.it_interval.tv_sec = 0;
+	timer_val.it_value.tv_sec = 0;
+	if (setitimer(ITIMER_REAL, &timer_val, NULL)) {
+		switch (errno) {
+		case EFAULT:
+		case EINVAL:
+			fprintf(stderr, "%s %s\n", ntfsd_stop_error,
+					ntfsd_internal_error);
+			break;
+		default:
+			perror(ntfsd_stop_error);
+		}
+		err = EFAULT;
+		goto unl_ret_false;
 	}
-	// Stop the timer.
 	tries = 0;
 retry_set_action:
 	if (sigaction(SIGALRM, &ntfsd_old_sigalrm_action, NULL)) {
-		int e = errno;
-		switch (e) {
+		switch (err = errno) {
+		case EINTR:
+			if (tries++ < 2)
+				goto retry_set_action;
+			perror(ntfsd_stop_error);
+			break;
+		case EINVAL:
+			fprintf(stderr, "%s %s\n", ntfsd_stop_error,
+					ntfsd_sigalrm_not_supported);
+			err = ENOTSUP;
+			break;
 		case EFAULT:
 			fprintf(stderr, "%s %s\n", ntfsd_stop_error,
 					ntfsd_internal_error);
 			break;
-		case EINTR:
-			if (tries++ < 2)
-				goto retry_set_action;
-			/* else fall through to default. */
 		default:
 			perror(ntfsd_stop_error);
+			err = EFAULT;
 		}
-		errno = e;
-		return FALSE;
+		timer_val.it_interval.tv_sec = 5;
+		timer_val.it_value.tv_sec = 5;
+		if (setitimer(ITIMER_REAL, &timer_val, NULL)) {
+			err = ECANCELED;
+			goto unl_ret_false_stopped;
+		}
 	}
-	goto unl_ret_true;
+unl_ret_true:
+	ClearNtfsdBusy(ntfsd_flags);
+	return TRUE;
+unl_ret_false:
+	atomic_inc(&ntfsd_times_started);
+	SetNtfsdStarted(ntfsd_flags);
+unl_ret_false_stopped:
+	errno = err;
+	ClearNtfsdBusy(ntfsd_flags);
+	return FALSE;
 }
 

[Linux-NTFS-cvs] CVS: linux-ntfs/include ntfsd.h,1.3,1.4

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv10467

Modified Files:
	ntfsd.h 
Log Message:
Extended ntfsd a bit to keep track of mounted volumes.


Index: ntfsd.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/ntfsd.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -U2 -r1.3 -r1.4
--- ntfsd.h	2001/04/07 13:47:55	1.3
+++ ntfsd.h	2001/04/07 14:46:14	1.4
@@ -26,5 +26,17 @@
 
 #include <linux/bitops.h>
+#include <linux/spinlock.h>
+#include <asm/atomic.h>
 
+#include "volume.h"
+
+/*
+ * These keep track of all mounted volumes. Ntfsd needs to know so it can
+ * walk the dirty list for each mounted volume.
+ */
+extern ntfs_volume *mounted_volumes;
+extern int nr_mounted_volumes;
+extern spinlock_t mounted_volumes_lock;
+
 /*
  * We use a set of atomic flags for locking / access serialization. No need of
@@ -55,6 +67,8 @@
  * ntfsd_start - start the writer daemon/thread
  *
- * Start the writer deamon / thread. Currently implemented using an interval
- * timer and a handler for the SIGALRM signal.
+ * Start the writer daemon / thread. Currently implemented using an interval
+ * timer and a handler for the SIGALRM signal. This function can and should be
+ * called whenever you mount a volume, so that we know how many times you need
+ * to call ntfs_stop() before we actually stop the writer.
  *
  * Return TRUE on success or FALSE on error. In the latter case, errno contains
@@ -72,4 +86,6 @@
  *	ENOTSUP - The host system does not support SIGALRM signal. )-:
  *	EFAULT - Internal error. This is BAD.
+ *	EMFILE - Ntfsd has been started too many times already. Cannot start
+ *		 again before at least one ntfsd_stop() call is issued.
  *	others - Other error codes returned by one of the system calls.
  */
@@ -79,6 +95,10 @@
  * ntfsd_stop - stop the writer daemon/thread
  *
- * Stop the writer deamon / thread. Currently implemented using an interval
- * timer and a handler for the SIGALRM signal.
+ * Stop the writer daemon / thread. Currently implemented using an interval
+ * timer and a handler for the SIGALRM signal. This functions should be called
+ * once for every umount performed. The daemon will only be stopped if
+ * ntfsd_stop() has been called the same number of times as ntfsd_start(), i.e.
+ * for every call to ntfsd_start(), you need to issue a corresponding
+ * ntfsd_stop().
  *
  * Return TRUE on success or FALSE on error. In the latter case, errno contains

[Linux-NTFS-cvs] CVS: linux-ntfs/include ntfsd.h,1.2,1.3

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv4422

Modified Files:
	ntfsd.h 
Log Message:
Final ntfsd.h (I hope).


Index: ntfsd.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/ntfsd.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- ntfsd.h	2001/04/07 00:45:49	1.2
+++ ntfsd.h	2001/04/07 13:47:55	1.3
@@ -28,10 +28,10 @@
 
 /*
- * We use a set of atomic flags for locking/control. No need of any
- * locking due to atomicity of operations.
+ * We use a set of atomic flags for locking / access serialization. No need of
+ * any additional locking (using spinlocks/semaphores/whatever) due to
+ * atomicity of operations.
  */
+extern unsigned int ntfsd_flags;
 
-unsigned int ntfsd_flags = 0;
-
 /* Ntfsd flags bit values */
 #define NTFSD_running	0
@@ -51,4 +51,59 @@
 #define SetNtfsdStarted(a)	set_bit(NTFSD_started, &(a))
 #define ClearNtfsdStarted(a)	clear_bit(NTFSD_started, &(a))
+
+/**
+ * ntfsd_start - start the writer daemon/thread
+ *
+ * Start the writer deamon / thread. Currently implemented using an interval
+ * timer and a handler for the SIGALRM signal.
+ *
+ * Return TRUE on success or FALSE on error. In the latter case, errno contains
+ * the error code.
+ *
+ * Important error codes:
+ * 	ECANCELED - The signal handler was set but the timer setting failed.
+ * 		    Tried resetting the signal handler but this failed. So,
+ * 		    ntfsd will handle SIGALRM should it occur, but it won't do
+ * 		    anything as it is not started.
+ * 	EBUSY - Ntfsd is busy in a previous call to ntfsd_start/ntfsd_stop.
+ *		Try calling again later.
+ *	EINTR - One of the system calls was interrupted more than three times
+ *		in a row. You could try again.
+ *	ENOTSUP - The host system does not support SIGALRM signal. )-:
+ *	EFAULT - Internal error. This is BAD.
+ *	others - Other error codes returned by one of the system calls.
+ */
+int ntfsd_start(void);
+
+/**
+ * ntfsd_stop - stop the writer daemon/thread
+ *
+ * Stop the writer deamon / thread. Currently implemented using an interval
+ * timer and a handler for the SIGALRM signal.
+ *
+ * Return TRUE on success or FALSE on error. In the latter case, errno contains
+ * the error code.
+ *
+ * On error, ntfsd remains active, unless errno is ECANCELED, in which case
+ * ntfsd has been stopped (and the timer has been stopped, so no periodic
+ * SIGALRM signals will be generated), but ntfsd is still registered as the
+ * SIGALRM handler (since uninstallation failed), so the code has to remain
+ * loaded in memory. In theory this will never occur but better catch the
+ * impossible before practise makes the the theoretically impossible possible.
+ *
+ * Important error codes:
+ * 	ECANCELED - The timer was stopped but the signal handler could not be
+ * 		    reset. Tried restarting the timer but this failed. So,
+ * 		    ntfsd will handle SIGALRM should it occur, but it won't do
+ * 		    anything as it is not started any more.
+ * 	EBUSY - Ntfsd is busy in a previous call to ntfsd_start/ntfsd_stop.
+ *		Try calling again later.
+ *	EINTR - One of the system calls was interrupted more than three times
+ *		in a row. You could try again.
+ *	ENOTSUP - The host system does not support SIGALRM signal. )-:
+ *	EFAULT - Internal error. This is BAD.
+ *	others - Other error codes returned by one of the system calls.
+ */
+int ntfsd_stop(void);
 
 #endif /* defined NTFSD_H */

[Linux-NTFS-cvs] CVS: linux-ntfs/libntfs Makefile.am,1.4,1.5 Makefile.in,1.3,1.4 ntfsd.c,1.1,1.2

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs/libntfs
In directory usw-pr-cvs1:/tmp/cvs-serv15003/libntfs

Modified Files:
	Makefile.am Makefile.in ntfsd.c 
Log Message:
Makefile updates.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- Makefile.am	2001/03/26 03:46:56	1.4
+++ Makefile.am	2001/04/07 00:53:37	1.5
@@ -20,5 +20,6 @@
         disk_io.c \
 	ntfs_rec.c \
-	unistr.c
+	unistr.c \
+	ntfsd.c
 
 INCLUDES = $(linux_ntfsincludedir) $(all_includes)

Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -U2 -r1.3 -r1.4
--- Makefile.in	2001/04/02 02:04:37	1.3
+++ Makefile.in	2001/04/07 00:53:37	1.4
@@ -96,5 +96,5 @@
 lib_LTLIBRARIES = libntfs.la
 libntfs_la_LDFLAGS = -version-info $(LTVERSION)
-libntfs_la_SOURCES =          attrib.c         bootsect.c         bitmap.c         mft.c         volume.c         disk_io.c 	ntfs_rec.c 	unistr.c
+libntfs_la_SOURCES =          attrib.c         bootsect.c         bitmap.c         mft.c         volume.c         disk_io.c 	ntfs_rec.c 	unistr.c 	ntfsd.c
 
 
@@ -110,5 +110,5 @@
 libntfs_la_LIBADD = 
 libntfs_la_OBJECTS =  attrib.lo bootsect.lo bitmap.lo mft.lo volume.lo \
-disk_io.lo ntfs_rec.lo unistr.lo
+disk_io.lo ntfs_rec.lo unistr.lo ntfsd.lo
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -123,6 +123,6 @@
 GZIP_ENV = --best
 DEP_FILES =  .deps/attrib.P .deps/bitmap.P .deps/bootsect.P \
-.deps/disk_io.P .deps/mft.P .deps/ntfs_rec.P .deps/unistr.P \
-.deps/volume.P
+.deps/disk_io.P .deps/mft.P .deps/ntfs_rec.P .deps/ntfsd.P \
+.deps/unistr.P .deps/volume.P
 SOURCES = $(libntfs_la_SOURCES)
 OBJECTS = $(libntfs_la_OBJECTS)

Index: ntfsd.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/ntfsd.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- ntfsd.c	2001/04/07 00:45:49	1.1
+++ ntfsd.c	2001/04/07 00:53:38	1.2
@@ -22,7 +22,4 @@
  */
 
-#include <unistd.h>
-#include <stdlib.h>
-
 #include <linux/bitops.h>
 #include <sys/time.h>
@@ -113,4 +110,5 @@
 		return FALSE;
 	}
+	// Set the timer.
 	goto unl_ret_true;
 }
@@ -131,4 +129,5 @@
 		return TRUE;
 	}
+	// Stop the timer.
 	tries = 0;
 retry_set_action:

[Linux-NTFS-cvs] CVS: linux-ntfs/include Makefile.am,1.3,1.4 Makefile.in,1.2,1.3

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv15003/include

Modified Files:
	Makefile.am Makefile.in 
Log Message:
Makefile updates.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -U2 -r1.3 -r1.4
--- Makefile.am	2001/03/26 03:42:13	1.3
+++ Makefile.am	2001/04/07 00:53:37	1.4
@@ -12,4 +12,5 @@
 	volume.h \
 	unistr.h \
-	support.h
+	support.h \
+	ntfsd.h
 

Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- Makefile.in	2001/04/02 02:04:37	1.2
+++ Makefile.in	2001/04/07 00:53:37	1.3
@@ -84,5 +84,5 @@
 
 linux_ntfsincludedir = $(includedir)/ntfs
-linux_ntfsinclude_HEADERS =  	attrib.h 	bitmap.h 	bootsect.h 	disk_io.h 	endians.h 	logfile.h 	mft.h 	ntfs_rec.h 	volume.h 	unistr.h 	support.h
+linux_ntfsinclude_HEADERS =  	attrib.h 	bitmap.h 	bootsect.h 	disk_io.h 	endians.h 	logfile.h 	mft.h 	ntfs_rec.h 	volume.h 	unistr.h 	support.h 	ntfsd.h
 
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

[Linux-NTFS-cvs] CVS: linux-ntfs/include ntfsd.h,1.1,1.2

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv12548/include

Modified Files:
	ntfsd.h 
Log Message:
Initial ntfsd implementation using alarm signal to emulate a usermode thread.
(This might not work when the library is installed as shared... Not sure, will
found out soon enough...)
Stil missing the acutal walking of volumes and their dirty mft entries, as
well as flushing them...


Index: ntfsd.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/ntfsd.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- ntfsd.h	2001/04/06 23:18:03	1.1
+++ ntfsd.h	2001/04/07 00:45:49	1.2
@@ -4,5 +4,5 @@
  * ntfsd.h - Exports for writer daemon. Part of the Linux-NTFS project.
  *
- * Copyright (c) 2000,2001 Anton Altaparmakov.
+ * Copyright (c) 2001 Anton Altaparmakov.
  *
  * This program/include file is free software; you can redistribute it and/or
@@ -35,15 +35,20 @@
 
 /* Ntfsd flags bit values */
-#define NTFSD_started	0
+#define NTFSD_running	0
 #define NTFSD_busy	1
-			/* bits 2-31 reserved for future use */
+#define NTFSD_started	2
+			/* bits 3-31 reserved for future use */
 
-#define NtfsdStarted(a)		test_bit(NTFSD_started, a)
-#define SetNtfsdStarted(a)	set_bit(NTFSD_started, a)
-#define ClearNtfsdStarted(a)	clear_bit(NTFSD_started, a)
-
-#define NtfsdBusy(a)		test_bit(NTFSD_busy, a)
-#define SetNtfsdBusy(a)		set_bit(NTFSD_busy, a)
-#define ClearNtfsdBusy(a)	clear_bit(NTFSD_busy, a)
+#define NtfsdRunning(a)		test_bit(NTFSD_running, &(a))
+#define SetNtfsdRunning(a)	set_bit(NTFSD_running, &(a))
+#define ClearNtfsdRunning(a)	clear_bit(NTFSD_running, &(a))
+
+#define NtfsdBusy(a)		test_bit(NTFSD_busy, &(a))
+#define SetNtfsdBusy(a)		set_bit(NTFSD_busy, &(a))
+#define ClearNtfsdBusy(a)	clear_bit(NTFSD_busy, &(a))
+
+#define NtfsdStarted(a)		test_bit(NTFSD_started, &(a))
+#define SetNtfsdStarted(a)	set_bit(NTFSD_started, &(a))
+#define ClearNtfsdStarted(a)	clear_bit(NTFSD_started, &(a))
 
 #endif /* defined NTFSD_H */

[Linux-NTFS-cvs] CVS: linux-ntfs/libntfs ntfsd.c,NONE,1.1

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs/libntfs
In directory usw-pr-cvs1:/tmp/cvs-serv12548/libntfs

Added Files:
	ntfsd.c 
Log Message:
Initial ntfsd implementation using alarm signal to emulate a usermode thread.
(This might not work when the library is installed as shared... Not sure, will
found out soon enough...)
Stil missing the acutal walking of volumes and their dirty mft entries, as
well as flushing them...


--- NEW FILE ---
/*
 * $Id: ntfsd.c,v 1.1 2001/04/07 00:45:49 antona Exp $
 * 
 * ntfsd.c - Writer daemon. Part of the Linux-NTFS project.
 *
 * Copyright (c) 2001 Anton Altaparmakov.
 *
 * This program/include file is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License as published
 * by the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program/include file is distributed in the hope that it will be 
 * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program (in the main directory of the Linux-NTFS 
 * distribution in the file COPYING); if not, write to the Free Software
 * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */

#include <unistd.h>
#include <stdlib.h>

#include <linux/bitops.h>
#include <sys/time.h>
#include <signal.h>
#include <string.h>
#include <stdio.h>
#include <errno.h>

#include "ntfsd.h"
#include "support.h"

static void ntfsd_thread(int i)
{
	if (!NtfsdStarted(ntfsd_flags) ||
	    test_and_set_bit(NTFSD_running, &ntfsd_flags))
		return;
	// TODO: Sync all volumes.
	ClearNtfsdRunning(ntfsd_flags);
	return;
}

static struct sigaction ntfsd_old_sigalrm_action;

static const char *ntfsd_internal_error = "Internal error.";
static const char *ntfsd_sigalrm_not_supported = "The system does not support "
						 "the SIGALRM signal.";

int ntfsd_start()
{	
	const char *ntfsd_start_error = "Linux-NTFS: failed to start ntfsd.";
	struct sigaction act;
	int tries;

	if (test_and_set_bit(NTFSD_busy, &ntfsd_flags)) {
		errno = EBUSY;
		return FALSE;
	}
	if (test_and_set_bit(NTFSD_started, &ntfsd_flags)) {
unl_ret_true:
		ClearNtfsdBusy(ntfsd_flags);
		return TRUE;
	}
	memset(&ntfsd_old_sigalrm_action, 0, sizeof(struct sigaction));
	tries = 0;
retry_get_action:
	if (sigaction(SIGALRM, NULL, &act)) {
		int e = errno;
		switch (e) {
		case EFAULT:
			fprintf(stderr, "%s %s\n", ntfsd_start_error,
					ntfsd_internal_error);
			break;
		case EINVAL:
			fprintf(stderr, "%s %s\n", ntfsd_start_error,
					ntfsd_sigalrm_not_supported);
			break;
		case EINTR:
			if (tries++ < 2)
				goto retry_get_action;
			/* else fall through to default. */
		default:
			perror(ntfsd_start_error);
		}
		errno = e;
		return FALSE;
	}
	if (act.sa_handler == &ntfsd_thread)
		goto unl_ret_true;
	memset(&act, 0, sizeof(struct sigaction));
	tries = 0;
retry_set_action:
	act.sa_handler = &ntfsd_thread;
	if (sigaction(SIGALRM, &act, &ntfsd_old_sigalrm_action)) {
		int e = errno;
		switch (e) {
		case EFAULT:
			fprintf(stderr, "%s %s\n", ntfsd_start_error,
					ntfsd_internal_error);
			break;
		case EINTR:
			if (tries++ < 2)
				goto retry_set_action;
			/* else fall through to default. */
		default:
			perror(ntfsd_start_error);
		}
		errno = e;
		return FALSE;
	}
	goto unl_ret_true;
}

int ntfsd_stop()
{
	const char *ntfsd_stop_error = "Linux-NTFS: failed to stop ntfsd.";
	struct sigaction act;
	int tries;

	if (test_and_set_bit(NTFSD_busy, &ntfsd_flags)) {
		errno = EBUSY;
		return FALSE;
	}
	if (!test_and_clear_bit(NTFSD_started, &ntfsd_flags)) {
unl_ret_true:
		ClearNtfsdBusy(ntfsd_flags);
		return TRUE;
	}
	tries = 0;
retry_set_action:
	if (sigaction(SIGALRM, &ntfsd_old_sigalrm_action, NULL)) {
		int e = errno;
		switch (e) {
		case EFAULT:
			fprintf(stderr, "%s %s\n", ntfsd_stop_error,
					ntfsd_internal_error);
			break;
		case EINTR:
			if (tries++ < 2)
				goto retry_set_action;
			/* else fall through to default. */
		default:
			perror(ntfsd_stop_error);
		}
		errno = e;
		return FALSE;
	}
	goto unl_ret_true;
}

[Linux-NTFS-cvs] CVS: linux-ntfs/include ntfsd.h,NONE,1.1

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv31260

Added Files:
	ntfsd.h 
Log Message:
Exports for writer daemon.


--- NEW FILE ---
/*
 * $Id: ntfsd.h,v 1.1 2001/04/06 23:18:03 antona Exp $
 *
 * ntfsd.h - Exports for writer daemon. Part of the Linux-NTFS project.
 *
 * Copyright (c) 2000,2001 Anton Altaparmakov.
 *
 * This program/include file is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License as published
 * by the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program/include file is distributed in the hope that it will be 
 * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program (in the main directory of the Linux-NTFS 
 * distribution in the file COPYING); if not, write to the Free Software
 * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */

#ifndef NTFSD_H
#define NTFSD_H

#include <linux/bitops.h>

/*
 * We use a set of atomic flags for locking/control. No need of any
 * locking due to atomicity of operations.
 */

unsigned int ntfsd_flags = 0;

/* Ntfsd flags bit values */
#define NTFSD_started	0
#define NTFSD_busy	1
			/* bits 2-31 reserved for future use */

#define NtfsdStarted(a)		test_bit(NTFSD_started, a)
#define SetNtfsdStarted(a)	set_bit(NTFSD_started, a)
#define ClearNtfsdStarted(a)	clear_bit(NTFSD_started, a)

#define NtfsdBusy(a)		test_bit(NTFSD_busy, a)
#define SetNtfsdBusy(a)		set_bit(NTFSD_busy, a)
#define ClearNtfsdBusy(a)	clear_bit(NTFSD_busy, a)

#endif /* defined NTFSD_H */

[Linux-NTFS-cvs] CVS: linux-ntfs/libntfs attrib.c,1.8,1.9 bitmap.c,1.2,1.3 disk_io.c,1.8,1.9 mft.c,1.3,1.4 volume.c,1.8,1.9

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs/libntfs
In directory usw-pr-cvs1:/tmp/cvs-serv3426/libntfs

Modified Files:
	attrib.c bitmap.c disk_io.c mft.c volume.c 
Log Message:
Commit of current state of development including locking a la kernel.
This doesn't work on user space (semaphores don't work).
Just want to have it committed. Will take out locking / modify it where
necessary to use pthreads ASAP.


Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/attrib.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -U2 -r1.8 -r1.9
--- attrib.c	2001/04/02 02:04:37	1.8
+++ attrib.c	2001/04/05 20:14:45	1.9
@@ -27,9 +27,9 @@
 #include <stdlib.h>
 
+#include "volume.h"
 #include "attrib.h"
 #include "mft.h"
 #include "endians.h"
 #include "disk_io.h"
-#include "volume.h"
 #include "unistr.h"
 #include "support.h"
@@ -530,5 +530,6 @@
 run_list decompress_run_list(const ATTR_RECORD *attr)
 {
-	__s64 vcn, lcn; 	/* Current vcn and lcn, respectively. */
+	VCN vcn;		/* Current vcn. */
+	LCN lcn; 		/* Current lcn. */
 	__s64 deltaxcn; 	/* Change in [vl]cn. */
 	run_list rl = NULL;	/* The output run_list. */
@@ -669,17 +670,23 @@
 }
 
-__s64 vcn_to_lcn(const run_list rl, const __s64 vcn)
+LCN vcn_to_lcn(const run_list rl, const VCN vcn)
 {
 	int i = 0;
 	
-	if (!rl || vcn < 0)
-		return -EINVAL;
-	if (!rl[0].length || vcn < rl[0].vcn)
-		return -ENOENT;
+	if (!rl || vcn < 0) {
+		errno = EINVAL;
+		return 0;
+	}
+	if (!rl[0].length || vcn < rl[0].vcn) {
+		errno = ENOENT;
+		return 0;
+	}
+	errno = 0;
 	do {
 		if (vcn < rl[++i].vcn)
 			return rl[i-1].lcn + (vcn - rl[i-1].vcn);
 	} while (rl[i].length);
-	return -ENOENT;
+	errno = ENOENT;
+	return 0;
 }
 

Index: bitmap.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/bitmap.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- bitmap.c	2001/04/03 22:42:42	1.2
+++ bitmap.c	2001/04/05 20:14:45	1.3
@@ -32,5 +32,6 @@
  */
 
-inline void ntfs_set_bit(__u8 *bitmap, const __u64 bit, const __u8 new_value)
+__inline__ void ntfs_set_bit(__u8 *bitmap, const __u64 bit,
+			     const __u8 new_value)
 {
 	if (!bitmap || new_value > 1)
@@ -42,5 +43,5 @@
 }
 
-inline char ntfs_get_bit(const __u8 *bitmap, const __u64 bit)
+__inline__ char ntfs_get_bit(const __u8 *bitmap, const __u64 bit)
 {
 	if (!bitmap)
@@ -49,5 +50,5 @@
 }
 
-inline char ntfs_get_and_set_bit(__u8 *bitmap, const __u64 bit,
+__inline__ char ntfs_get_and_set_bit(__u8 *bitmap, const __u64 bit,
 			    const __u8 new_value)
 {

Index: disk_io.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/disk_io.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -U2 -r1.8 -r1.9
--- disk_io.c	2001/04/03 22:42:42	1.8
+++ disk_io.c	2001/04/05 20:14:45	1.9
@@ -280,6 +280,7 @@
 		    const MFT_REFERENCE *mref, const int count)
 {
-	__u64 br, m;
-	__s64 lcn, ofs;
+	__u64 br, ofs;
+	LCN lcn;
+	VCN m;
 	
 	if (!vol || !mrec)

Index: mft.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/mft.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -U2 -r1.3 -r1.4
--- mft.c	2001/04/03 23:38:34	1.3
+++ mft.c	2001/04/05 20:14:45	1.4
@@ -33,5 +33,4 @@
 	if (!b || !is_mft_recordp(b))
 		return 0;
-
 	/* Get the number of used bytes and return it. */
 	return le32_to_cpu(b->bytes_in_use);
@@ -41,11 +40,222 @@
 {
 	ntfs_volume *v = mentry->m_vol;
-	
+	down_write(&mentry->m_sem);
 	down_write(&v->mft_entries_sem);
-        list_add(&mentry->m_dirty_list, &v->dirty_mft_entries);
+        list_add_tail(&mentry->m_dirty_list, &v->dirty_mft_entries);
 	v->nr_dirty_mft_entries++;
 	up_write(&v->mft_entries_sem);
+	up_write(&mentry->m_sem);
+}
+
+__inline__ mft_entry *__allocate_mft_entry(void)
+{
+	mft_entry *me = (mft_entry *)malloc(sizeof(mft_entry));
+	if (!me)
+		return NULL;
+	memset(me, 0, sizeof(mft_entry));
+	init_rwsem(&me->m_rec_sem);
+	init_rwsem(&me->m_sem);
+	INIT_LIST_HEAD(me->m_list);
+	INIT_LIST_HEAD(me->m_dirty_list);
+	return me;
+}
+
+__inline__ int __free_mft_entry(mft_entry *me)
+{
+	down_read(&me->m_sem);
+	if (atomic_read(me->count) || MftEntryDirty(me) || MftEntryMapped(me)) {
+		up_read(&me->m_sem);
+		return -EBUSY;
+	}
+	up_read(&me->m_sem);
+	down_write(&me->m_sem);
+	/* Just making sure nobody else is holding the semaphore... */
+	down_up(&me->m_sem);
+	free(me);
+	return 0;
+}
+
+int __map_mft_entry(mft_entry *me)
+{
+	VCN mref;
+	LCN lcn;
+	__u64 ofs;
+	MFT_RECORD *mrec;
+	int i;
+	
+	if (MftEntryMapped(me))
+		return 0;
+	mref = (VCN)(*(__u64*)me->m_ref & MFT_REFERENCE_MASK_CPU);
+	mrec = (MFT_RECORD*)malloc(vol->mft_record_size);
+	if (!mrec)
+		goto err_ret_errno;
+	/* Size of mft record != size of cluster thus need to work with
+	 * offsets into clusters. */
+	if (vol->mft_records_per_cluster) {
+		lcn = vcn_to_lcn(vol->mft_runlist,
+					mref / vol->mft_records_per_cluster);
+		/* FIXME: Change "/" above and "%" below to ">>" and "&"
+		   respectively! */
+		ofs = mref % vol->mft_records_per_cluster;
+		ofs <<= vol->mft_record_size_bits;
+	} else {
+		lcn = vcn_to_lcn(vol->mft_runlist,
+					mref * vol->clusters_per_mft_record);
+		/* FIXME: Change "*" above to "<<"! */
+		ofs = 0;
+	}
+	if (lcn < 0)
+		goto err_ret_errno;
+	down_write(&me->m_mrec_sem);
+	i = mst_pread(vol->fd, (__u8*)mrec, vol->mft_record_size, 1, 
+					(lcn << vol->cluster_size_bits) + ofs);
+	up_write(&me->m_mrec_sem);
+	if (i != 1) {
+                if (i == -1)
+			goto err_ret_errno;
+		return -EIO;
+	}
+	down_write(&me->m_sem);
+	me->m_rec = mrec;
+	SetMftEntryMapped(me);
+	up_write(&me->m_sem);
+	return 0;
+err_ret_errno:
+	return -errno;
+}
+
+int __unmap_mft_entry(mft_entry *me)
+{
+	int err;
+
+	if (atomic_read(&me->m_count))
+		return -EBUSY;
+	down_write(&me->m_sem);
+	if (!test_and_clear_bit(ME_mapped, &me->m_flags)) {
+		up_write(&me->m_sem);
+		return 0;
+	}
+	if (MftEntryDirty(me)) {
+		if (err = flush_mft_entry(me))
+			goto err_up_ret;
+		if (MftEntryDirty(me)) {
+			err = -EBUSY;
+			goto err_up_ret;
+		}
+	}
+	down_write(&me->m_rec_sem);
+	free(me->m_rec);
+	up_write(&me->m_rec_sem);
+	up_write(&me->m_sem);
+	return 0;
+err_up_ret:
+	up_write(&me->m_sem);
+	return err;
+}
+
+int flush_mft_entry(const mft_entry *me)
+{
+	VCN mref;
+	LCN lcn;
+	__u64 ofs;
+	MFT_RECORD *mrec;
+	__u32 i;
+	
+	if (!MftEntryMapped(me))
+		return 0;
+	mref = (VCN)(*(__u64*)me->m_ref & MFT_REFERENCE_MASK_CPU);
+	/* Size of mft record != size of cluster thus need to work with offsets
+	 * into clusters. */
+	if (vol->mft_records_per_cluster) {
+		lcn = vcn_to_lcn(vol->mft_runlist,
+					mref / vol->mft_records_per_cluster);
+		/* FIXME: Change "/" above and "%" below to ">>" and "&"
+		   respectively! */
+		ofs = mref % vol->mft_records_per_cluster;
+		ofs <<= vol->mft_record_size_bits;
+	} else {
+		lcn = vcn_to_lcn(vol->mft_runlist,
+					m * vol->clusters_per_mft_record);
+		/* FIXME: Change "*" above to "<<"! */
+		ofs = 0;
+	}
+	if (lcn < 0)
+		return -errno;
+	down_write(&me->m_rec_sem);
+	i = mst_pwrite(vol->fd, me->m_rec, vol->mft_record_size, 
+					(lcn << vol->cluster_size_bits) + ofs);
+	up_write(&me->m_rec_sem);
+	if (i != vol->mft_record_size) {
+		if (i == -1)
+			goto err_ret_errno;
+		return -EIO;
+	}
+	ClearMftEntryDirty(me);
+	return 0;
+err_ret_errno:
+	return -errno;
+}
+
+int insert_mft_entry(ntfs_volume *vol, mft_entry *me, MFT_REFERENCE mref,
+		MFT_RECORD *mrec, int dirty)
+{
+	struct list_head *tmp;
+	mft_entry *m;
+	
+	*(__u64*)&me->m_ref = mref;
+	me->m_vol = vol;
+	if (mrec) {
+		me->m_rec = mrec;
+		SetMftEntryMapped(me);
+	} else
+		__map_mft_entry(me);
+	down_write(&vol->mft_entries_sem);
+	list_for_each(tmp, &vol->mft_entries) {
+		m = list_entry(tmp, mft_entry, m_list);
+		if ((__u64)m->m_ref & MFT_REFERENCE_MASK_CPU <
+				(__u64)me->m_ref & MFT_REFERENCE_MASK_CPU)
+			continue;
+		if (m->m_ref == me->m_ref) {
+			up_write(&vol->mft_entries_sem);
+			return -EEXIST; /* BUG()! */
+		}
+		__list_add(&me->m_list, &tmp->m_list->prev, &tmp->m_list);
+		break;
+	}
+	vol->nr_mft_entries++;
+	if (mrec && dirty) {
+		down_write(&me->m_sem);
+		SetMftEntryDirty(me);
+	        list_add_tail(&me->m_dirty_list, &vol->dirty_mft_entries);
+		up_write(&me->m_sem);
+		vol->nr_dirty_mft_entries++;
+	}
+	up_write(&vol->mft_entries_sem);
+	return 0;
+}
+
+int remove_mft_entry(mft_entry *me)
+{
+	ntfs_volume *vol = me->m_vol;
 	
-	return;
+	if (atomic_read(me->count))
+		return -EBUSY;
+	if (MftEntryDirty(me))
+		flush_mft_entry(me);
+	down_write(&vol->mft_entries_sem);
+	if (atomic_read(me->count)) {
+		up_write(&vol->mft_entries_sem);
+		return -EBUSY;
+	}
+	list_del(&me->m_list);
+	vol->nr_mft_entries--;
+	up_write(&vol->mft_entries_sem);
+	down_write(&me->m_rec_sem);
+	free(me->m_rec);
+	up_write(&me->m_rec_sem);
+	down_write(&me->m_sem);
+	up_write(&me->m_sem);
+	free(me);
+	return 0;
 }
 

Index: volume.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/volume.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -U2 -r1.8 -r1.9
--- volume.c	2001/04/02 02:04:37	1.8
+++ volume.c	2001/04/05 20:14:45	1.9
@@ -185,4 +185,22 @@
 						vol->clusters_per_mft_record);
 #endif
+	/* Initialize files and mft records lists and associated variables. */
+	INIT_LIST_HEAD(vol->open_files);
+	INIT_LIST_HEAD(vol->closed_files);
+	vol->max_files = 1000;
+	init_rwsem(&vol->files_sem);
+	INIT_LIST_HEAD(vol->mft_entries);
+	INIT_LIST_HEAD(vol->dirty_mft_entries);
+	init_rwsem(&vol->mft_entries_sem);
+	/* Note: No locking needed until we return from this function. */
+	/*if (!(me = __allocate_mft_entry())) {
+		int eo = errno;
+                puts(FAILED);
+		errno = eo;
+                perror("Error allocating mft entry.");
+		errno = eo;
+		goto error_exit;
+	}
+	*/
 	/* Start with $Mft. */
 	printf("Loading $Mft... ");

[Linux-NTFS-cvs] CVS: linux-ntfs/include attrib.h,1.21,1.22 bitmap.h,1.3,1.4 mft.h,1.14,1.15

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv3426/include

Modified Files:
	attrib.h bitmap.h mft.h 
Log Message:
Commit of current state of development including locking a la kernel.
This doesn't work on user space (semaphores don't work).
Just want to have it committed. Will take out locking / modify it where
necessary to use pthreads ASAP.


Index: attrib.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/attrib.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -U2 -r1.21 -r1.22
--- attrib.h	2001/04/02 22:28:39	1.21
+++ attrib.h	2001/04/05 20:14:45	1.22
@@ -1704,6 +1704,17 @@
  * Determine the logical cluster number given the virtual cluster number @vcn
  * and the run list @rl describing the mapping between the LCNs and VCNs. 
- * Return -ERRNO on error (ERRNO being the error number) and notably -NOENT 
- * if vcn is outside the boundaries covered by the run list.
+ * 
+ * Return values:
+ * 
+ * 	> 0: The lcn corresponding to the vcn.
+ * 	
+ * 	0: Check errno:
+ * 		If zero, the lcn corresponding to the vcn is zero.
+ * 		Otherwise, there was an error and errno contains the error code,
+ * 		the most interesting error being ENOENT indicating we are
+ * 		looking for a vcn which doesn't exist.
+ * 		
+ *	-1: The lcn is sparse, i.e. it's contents are zero and there is no disk
+ *	    space allocated for it.
  */
 LCN vcn_to_lcn(const run_list rl, const VCN vcn);

Index: bitmap.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/bitmap.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -U2 -r1.3 -r1.4
--- bitmap.h	2001/04/03 22:41:30	1.3
+++ bitmap.h	2001/04/05 20:14:45	1.4
@@ -43,6 +43,6 @@
  * Set the bit @bit in the @bitmap to @new_value. Ignore all errors.
  */
-extern inline void ntfs_set_bit(__u8 *bitmap, const __u64 bit,
-			   const __u8 new_value);
+extern __inline__ void ntfs_set_bit(__u8 *bitmap, const __u64 bit,
+				    const __u8 new_value);
 
 /**
@@ -54,5 +54,5 @@
  * Return -1 on error.
  */
-extern inline char ntfs_get_bit(const __u8 *bitmap, const __u64 bit);
+extern __inline__ char ntfs_get_bit(const __u8 *bitmap, const __u64 bit);
 
 /**
@@ -65,5 +65,5 @@
  * Return -1 on error.
  */
-extern inline char ntfs_get_and_set_bit(__u8 *bitmap, const __u64 bit,
+extern __inline__ char ntfs_get_and_set_bit(__u8 *bitmap, const __u64 bit,
 				   const __u8 new_value);
 

Index: mft.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/mft.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -U2 -r1.14 -r1.15
--- mft.h	2001/04/03 23:38:54	1.14
+++ mft.h	2001/04/05 20:14:45	1.15
@@ -25,4 +25,8 @@
 #define MFT_H
 
+#ifndef __KERNEL__
+#define __KERNEL__
+#endif
+
 #include <asm/atomic.h>
 #include <asm/semaphore.h>
@@ -31,4 +35,5 @@
 #include "endians.h"
 #include "ntfs_rec.h"
+#include "volume.h"
 
 #define is_mft_record(x)	( is_file_record(x) )
@@ -324,4 +329,6 @@
  * 		first if dirty flag is set).
  * 
+ * m_sem:	Read write semaphore controlling access to this entry.
+ *
  * m_list:	Hook for the mft_entries linked list.
  *
@@ -395,18 +402,11 @@
 #define ClearMftEntryDirty(me)		clear_bit(ME_dirty, &(me)->m_flags)
 
-extern void __set_mft_entry_dirty(mft_entry *);
-
-static inline void set_mft_entry_dirty(mft_entry *me)
-{
-	if (!test_and_set_bit(ME_dirty, &me->m_flags))
-		__set_mft_entry_dirty(me);
-}
-
 typedef struct {
 	MFT_RECORD *m_rec;
-	rw_semaphore m_rec_sem;
- 	unsigned int m_flags; /* mapped, dirty */
+	struct rw_semaphore m_rec_sem;
+ 	unsigned int m_flags;
 	MFT_REFERENCE m_ref;
  	atomic_t m_count;
+	struct rw_semaphore m_sem;
  	struct list_head m_list;
 	struct list_head m_dirty_list;
@@ -414,9 +414,17 @@
 } mft_entry;
 
+void __set_mft_entry_dirty(mft_entry *me);
+
+static __inline__ void set_mft_entry_dirty(mft_entry *me)
+{
+	if (!test_and_set_bit(ME_dirty, &me->m_flags))
+		__set_mft_entry_dirty(me);
+}
+
 typedef struct {
 	MFT_REFERENCE *f_mft_refs;
-	mft_erntry *f_mft_entries;
+	mft_entry *f_mft_entries;
 	int f_nr_mft_refs;
-	rw_semaphore f_sem;
+	struct rw_semaphore f_sem;
 	atomic_t f_count;
 	struct list_head f_list;
@@ -424,4 +432,113 @@
 
 /**
+ * __allocate_mft_entry - allocate a new mft_entry and initialize it
+ *
+ * Return the new mft_entry on success or NULL with errno set to the error code.
+ */
+extern __inline__ mft_entry *__allocate_mft_entry(void);
+
+/**
+ * free_mft_entry - free a mft_entry
+ * @me:		mft_entry to free
+ * 
+ * Must be unlocked, use count 0, etc, or we return -EBUSY.
+ * Return 0 on success and -ERRNO on error.
+ */
+extern __inline__ int free_mft_entry(mft_entry *me);
+
+/**
+ * insert_mft_entry - insert a mft_entry in a volume
+ * @vol:	volume to insert into
+ * @me:		mft_entry to insert
+ * @mref:	mft reference the mft entry will have
+ * @mrec:	optional loaded MFT_RECORD corresponding to @mref
+ * @dirty:	boolean whether @mrec is dirty or not (only if @mrec present)
+ * 
+ * Initialize the mft_entry with the values of @mref, @mrec and @dirty and
+ * insert it into the volume @vol. If @mrec is not present, the mft record
+ * corresponding to @mref is loaded from the volume.
+ *
+ * Return 0 on success and -ERRNO on error.
+ */
+int insert_mft_entry(ntfs_volume *vol, mft_entry *me, MFT_REFERENCE mref,
+		     MFT_RECORD *mrec, int dirty);
+
+/**
+ * remove_mft_entry - remove a mft_entry from it's volume and free it
+ * @me:		mft_entry to remove and free
+ * 
+ * The mft entry must have a use count of 0, or we return -EBUSY.
+ * 
+ * Remove the mft entry from the volume, flush it to disk if necessary,
+ * and finally free all memory that was used by the entry including the entry
+ * itself.
+ * 
+ * Return 0 on success and -ERRNO on error.
+ */
+int remove_mft_entry(mft_entry *me);
+
+/**
+ * __map_mft_entry - map an mft entry into memory
+ * @me:		mft entry to map
+ *
+ * Map an (unmapped) mft entry into memory not increasing the use count.
+ * 
+ * Return 0 on success or -ERRNO on error.
+ */
+int __map_mft_entry(mft_entry *me);
+
+/**
+ * map_mft_entry - map an mft entry into memory
+ * @me:		mft entry to map
+ *
+ * Map an (unmapped) mft entry into memory and increase the use count.
+ *
+ * Return 0 on success or -ERRNO on error.
+ */
+static __inline__ int map_mft_entry(mft_entry *me)
+{
+	atomic_inc(&me->m_count);
+	if (MftEntryMapped(me))
+		return 0;
+	return __map_mft_entry(me);
+}
+
+/**
+ * unmap_mft_entry - unmap an mft entry
+ * @me:		mft entry to unmap
+ *
+ * Decrease the use count of the mft entry (only if it is above 0). Do not
+ * actually unmap it. We always keep it cached in memory. However, when we
+ * have unmapped it and the count has reached zero, the entry can be safely
+ * unmapped if it is necessary but that happens elsewhere.
+ */
+static __inline__ void unmap_mft_entry(mft_entry *me)
+{
+	if (MftEntryMapped(me) && atomic_read(&me->m_count) > 0)
+		atomic_dec(&me->m_count);
+}
+
+/**
+ * __unmap_mft_entry - unmap an mft entry
+ * @me:		mft entry to unmap
+ *
+ * Actually unmap the mft entry (only if use count is 0).
+ *
+ * Return zero on success or -ERRNO on error.
+ */
+int __unmap_mft_entry(mft_entry *me);
+
+/**
+ * flush_mft_entry - flush a mft_entry to disk
+ * @me:		mft_entry to flush
+ * 
+ * The mft entry is written to disk (if dirty) and marked clean. It is also
+ * removed from the dirty list of the volume.
+ * 
+ * Return 0 on success and -ERRNO on error.
+ */
+int flush_mft_entry(mft_entry *me);
+
+/**
  * ntfs_open_by_mref - open an ntfs file, i.e. mft record, given a mft reference
  * @vol:	ntfs volume to operate on
@@ -445,6 +562,6 @@
  * @fref:	ntfs_file pointer to close
  *
- * Close a previously opened ntfs file. Return zero on success or -ERRNO on
- * error, where ERRNO is the error number.
+ * Close a previously opened ntfs file. Return zero on success or -1 on
+ * error, where errno is the error number.
  */
 int ntfs_close(ntfs_file *fref);

[Linux-NTFS-cvs] CVS: linux-ntfs/include mft.h,1.13,1.14

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv10691

Modified Files:
	mft.h 
Log Message:
Minor fix


Index: mft.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/mft.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -U2 -r1.13 -r1.14
--- mft.h	2001/04/03 23:35:52	1.13
+++ mft.h	2001/04/03 23:38:54	1.14
@@ -410,4 +410,5 @@
  	atomic_t m_count;
  	struct list_head m_list;
+	struct list_head m_dirty_list;
 	ntfs_volume *m_vol;
 } mft_entry;

[Linux-NTFS-cvs] CVS: linux-ntfs/libntfs mft.c,1.2,1.3

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs/libntfs
In directory usw-pr-cvs1:/tmp/cvs-serv10645

Modified Files:
	mft.c 
Log Message:
Mark mft entry dirty function complete


Index: mft.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/mft.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- mft.c	2001/03/05 03:04:40	1.2
+++ mft.c	2001/04/03 23:38:34	1.3
@@ -1,3 +1,5 @@
 /*
+ * $Id$
+ *
  * mft.c - Mft record handling code. Part of the Linux-NTFS project.
  *
@@ -21,4 +23,6 @@
 
 #include <linux/types.h>
+#include <linux/list.h>
+#include <linux/errno.h>
 
 #include "mft.h"
@@ -32,4 +36,28 @@
 	/* Get the number of used bytes and return it. */
 	return le32_to_cpu(b->bytes_in_use);
+}
+
+void __set_mft_entry_dirty(mft_entry *mentry)
+{
+	ntfs_volume *v = mentry->m_vol;
+	
+	down_write(&v->mft_entries_sem);
+        list_add(&mentry->m_dirty_list, &v->dirty_mft_entries);
+	v->nr_dirty_mft_entries++;
+	up_write(&v->mft_entries_sem);
+	
+	return;
+}
+
+ntfs_file *ntfs_open_by_mref(const ntfs_volume *vol, const MFT_REFERENCE *mref)
+{
+	errno = -ENOTSUP;
+	return NULL;
+}
+
+int ntfs_close(ntfs_file *fref)
+{
+	errno = -ENOTSUP;
+	return -1;
 }
 

[Linux-NTFS-cvs] CVS: linux-ntfs/include mft.h,1.12,1.13

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv10357

Modified Files:
	mft.h 
Log Message:
Few updates.


Index: mft.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/mft.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -U2 -r1.12 -r1.13
--- mft.h	2001/04/03 22:41:30	1.12
+++ mft.h	2001/04/03 23:35:52	1.13
@@ -1,3 +1,5 @@
 /*
+ * $Id$
+ *
  * mft.h - Exports for MFT record handling. Part of the Linux-NTFS project.
  *
@@ -283,5 +285,5 @@
  *
  * dirty_mft_entries:	Linked list of all loaded mft records which are dirty.
- * 			Used by the disk writter thread. When a mft_entry is
+ * 			Used by the disk writer thread. When a mft_entry is
  * 			marked dirty, the entry is added to the end of this
  * 			list. When it is flushed to disk, it is marked clean
@@ -323,4 +325,7 @@
  * 
  * m_list:	Hook for the mft_entries linked list.
+ *
+ * m_dirty_list: Hook for the dirty_mft_enties linked list. (Only valid if
+ *		the dirty flag is set.)
  * 
  * m_vol:	Volume this entry and its mft record belong to.
@@ -328,5 +333,10 @@
  * Future:
  *
- * 	Add aging for mft_entries.
+ *   -	Reference all loaded non-resident attributes somehow. Need this for the
+ *	search context work and we do need to keep them so we can have two
+ *	readers at the same time. So we need to somehow specify which attribute
+ *	we are talking about, possibly which mft record it is in (+ position
+ *	in attribute list?) and a pointer to the attribute value itself.
+ *   -	Add aging for mft_entries.
  *
  * The ntfs_file struct (file = base mft record).

[Linux-NTFS-cvs] CVS: linux-ntfs/libntfs disk_io.c,1.7,1.8 bitmap.c,1.1,1.2

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs/libntfs
In directory usw-pr-cvs1:/tmp/cvs-serv2134

Modified Files:
	disk_io.c bitmap.c 
Log Message:
See last commit message.


Index: disk_io.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/disk_io.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -U2 -r1.7 -r1.8
--- disk_io.c	2001/04/02 02:04:37	1.7
+++ disk_io.c	2001/04/03 22:42:42	1.8
@@ -290,5 +290,5 @@
 	if (vol->number_of_mft_records < m + count)
 		return -ESPIPE;
-	if (!get_bit(vol->mft_bitmap, m))
+	if (!ntfs_get_bit(vol->mft_bitmap, m))
 		return -ENOENT;
 	/* Size of mft record != size of cluster thus need to work with
@@ -424,5 +424,5 @@
 	if (vol->number_of_mft_records <= m)
 		return -ESPIPE;
-	if (!get_bit(vol->mft_bitmap, m))
+	if (!ntfs_get_bit(vol->mft_bitmap, m))
 		return -ENOENT;
 	/* Size of mft record != size of cluster thus need to work with offsets

Index: bitmap.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/bitmap.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- bitmap.c	2001/01/25 22:25:43	1.1
+++ bitmap.c	2001/04/03 22:42:42	1.2
@@ -32,5 +32,5 @@
  */
 
-inline void set_bit(__u8 *bitmap, const __u64 bit, const __u8 new_value)
+inline void ntfs_set_bit(__u8 *bitmap, const __u64 bit, const __u8 new_value)
 {
 	if (!bitmap || new_value > 1)
@@ -42,5 +42,5 @@
 }
 
-inline char get_bit(const __u8 *bitmap, const __u64 bit)
+inline char ntfs_get_bit(const __u8 *bitmap, const __u64 bit)
 {
 	if (!bitmap)
@@ -49,5 +49,5 @@
 }
 
-inline char get_and_set_bit(__u8 *bitmap, const __u64 bit,
+inline char ntfs_get_and_set_bit(__u8 *bitmap, const __u64 bit,
 			    const __u8 new_value)
 {

[Linux-NTFS-cvs] CVS: linux-ntfs/include bitmap.h,1.2,1.3 mft.h,1.11,1.12 volume.h,1.5,1.6

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv1807

Modified Files:
	bitmap.h mft.h volume.h 
Log Message:
We now have files and keep track of them on a per volume basis and same
for inodes (mft_records). At least conceptually anyway.


Index: bitmap.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/bitmap.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- bitmap.h	2001/01/25 22:25:43	1.2
+++ bitmap.h	2001/04/03 22:41:30	1.3
@@ -36,5 +36,5 @@
 
 /**
- * set_bit - set a bit in a field of bits
+ * ntfs_set_bit - set a bit in a field of bits
  * @bitmap:	field of bits
  * @bit:	bit to set
@@ -43,5 +43,5 @@
  * Set the bit @bit in the @bitmap to @new_value. Ignore all errors.
  */
-extern inline void set_bit(__u8 *bitmap, const __u64 bit,
+extern inline void ntfs_set_bit(__u8 *bitmap, const __u64 bit,
 			   const __u8 new_value);
 
@@ -54,5 +54,5 @@
  * Return -1 on error.
  */
-extern inline char get_bit(const __u8 *bitmap, const __u64 bit);
+extern inline char ntfs_get_bit(const __u8 *bitmap, const __u64 bit);
 
 /**
@@ -65,5 +65,5 @@
  * Return -1 on error.
  */
-extern inline char get_and_set_bit(__u8 *bitmap, const __u64 bit,
+extern inline char ntfs_get_and_set_bit(__u8 *bitmap, const __u64 bit,
 				   const __u8 new_value);
 

Index: mft.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/mft.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -U2 -r1.11 -r1.12
--- mft.h	2001/04/02 02:04:37	1.11
+++ mft.h	2001/04/03 22:41:30	1.12
@@ -23,4 +23,8 @@
 #define MFT_H
 
+#include <asm/atomic.h>
+#include <asm/semaphore.h>
+#include <linux/list.h>
+
 #include "endians.h"
 #include "ntfs_rec.h"
@@ -231,4 +235,207 @@
  */
 inline __u32 get_mft_record_data_size(const MFT_RECORD *b);
+
+/*
+ * Implementation of files (aka mft records, aka inodes) in memory.
+ * ================================================================
+ *
+ * NOTE: I have completely ignored the existence of things like directories
+ * and directory references for the moment! These will just be added later on.
+ * The directories themselves are of course covered by being base mft records
+ * and hence follow the same semantics like every other mft record.
+ *
+ * Volume struct (typedef is in volume.h).
+ * ---------------------------------------
+ * 
+ * open_files:		Linked list of ntfs_file struct pointers, keeping track
+ * 			of all files which have been loaded into memory and are
+ * 			open.
+ *
+ * nr_open_files:	Number of open files.
+ *
+ * closed_files:	Linked list of ntfs_file struct pointers, keeping track
+ * 			of all cached files which are not open any more.
+ *
+ * nr_closed_files:	Number of closed files.
+ *
+ * max_files:		Maximum number of nr_open_files + nr_closed_files.
+ * 
+ * files_sem:		Read write semaphore to serialize access to the above
+ * 			structure members (open_files, nr_open_files,
+ * 			closed_files, nr_closed_files and max_files).
+ *
+ * As files are opened/closed, records move from one list to the other. When a
+ * file is opened it moves to the front of files_open as we expect to do I/O on
+ * it very soon so want quick access to it. When a file is closed, it moves to
+ * the end of files_closed as we don't expect it to be opened any time soon.
+ *
+ * Note: We probably want to replace these with hash tables once the library
+ * matures and users start complaining about the speed of it... but this will
+ * do for now.
+ * 
+ * mft_entries:		Linked list of all loaded mft records (disk inodes) in
+ * 			order of ascending mft record number (disk inode number,
+ * 			i.e. disregarding the sequence number). Note, the list
+ * 			members are not the actual MFT_RECORDS, but in memory
+ * 			mft_entry structs.
+ *
+ * nr_mft_entries:	Number of mft_entries.
+ *
+ * dirty_mft_entries:	Linked list of all loaded mft records which are dirty.
+ * 			Used by the disk writter thread. When a mft_entry is
+ * 			marked dirty, the entry is added to the end of this
+ * 			list. When it is flushed to disk, it is marked clean
+ * 			and removed from this list.
+ *
+ * nr_dirty_mft_entries:	Number of dirty mft_entries.
+ *
+ * mft_entries_sem:	Read write semaphore to serialize access to the above
+ * 			structure members (mft_entries, nr_mft_entries and their
+ * 			dirty equivalents).
+ *
+ * The mft_entry struct.
+ * ---------------------
+ *
+ * Each loaded mft record is represented by the mft_entry structure which
+ * contains these members:
+ * 
+ * m_rec:	Pointer to the actual MFT_RECORD. (Only valid if mapped flag is
+ * 		set.)
+ * 
+ * m_rec_sem:	Read write semaphore controlling access to m_rec. Only one
+ * 		writer at a time (and no readers while one writer) as the mft
+ * 		record will be corrupt during the write	process.
+ * 
+ * m_flags:	Atomic flags describing the mft entry / record:
+ * 
+ * 	mapped:		Is the MFT_RECORD actually in memory? (Is mrec valid?)
+ *
+ * 	dirty:		Does the record need to be written to disk? (If not, it
+ * 			is safe to discard m_rec, but only if m_count is zero
+ * 			and we are holding m_rec_sem for writing.)
+ *
+ * m_ref:	Mft reference of the mft record described by this entry. (This
+ *		includes the sequence number for consistency checking purposes.)
+ *
+ * m_count:	Atomic usage count. When zero this record is not referenced by
+ * 		any files and can be thrown away safely (writing it to disk
+ * 		first if dirty flag is set).
+ * 
+ * m_list:	Hook for the mft_entries linked list.
+ * 
+ * m_vol:	Volume this entry and its mft record belong to.
+ *
+ * Future:
+ *
+ * 	Add aging for mft_entries.
+ *
+ * The ntfs_file struct (file = base mft record).
+ * ----------------------------------------------
+ *
+ * Each loaded file is described by an ntfs_file struct, which contains these
+ * members:
+ *
+ * f_mft_refs:	The mft references of the file (i.e. the on disk inode number).
+ * 		This is an array of MFT_REFERENCEs. The first reference is the
+ * 		base mft record and if any others exist they are the associated
+ * 		loaded extension mft records. Used for attribute list purposes.
+ *
+ * f_mft_entries:	The loaded mft records for the file. This is an array of
+ * 		pointers to mft_entries, corresponding to the f_mft_refs. This
+ * 		is not strictly necessary but results in a big speed up as we
+ * 		don't need to search the vol->mft_entries list every time...
+ *
+ * When an entry is referenced in the above lists the usage count for the
+ * corresponding entry is increased by one.
+ * 
+ * f_nr_mft_refs:	Number of records in the f_mft_* arrays. If > 1, we
+ * 		know there must be an attribute list attribute (but if 1, we
+ * 		cannot assume there isn't one). This is of course the same as
+ * 		a possible f_nr_mft_entries, but refs is shorter to write. (-;
+ *
+ * f_sem:	Read write semaphore for serializing access to the above struct
+ * 		members (f_mft_refs, f_mft_entries and f_nr_mft_refs).
+ *
+ * f_count:	Atomic usage count. When zero this file is not open by anyone
+ * 		and can be thrown away safely. No need to concern oneself with
+ * 		dirty state as this is done on a mft_entry level, i.e. one level
+ * 		below the idea of files.
+ *
+ * f_list:	Hook into vol->open/closed_files list.
+ * 
+ * Notes:
+ *
+ *   -	No field to know whether we have the file open for writing as this is
+ *	provided on a mft_entry level, i.e. below the files/directories level.
+ *	This might turn out to be a mistake and is subject to change in the
+ *	future if the current approach turns out not to work...
+ */
+
+/* Mft entry flag bit values */
+#define ME_mapped	0
+#define ME_dirty	1
+			/* bits 2-31 reserved for future use */
+
+#define MftEntryMapped(me)		test_bit(ME_mapped, &(me)->m_flags)
+#define SetMftEntryMapped(me)		set_bit(ME_mapped, &(me)->m_flags)
+#define ClearMftEntryMapped(me)		clear_bit(ME_mapped, &(me)->m_flags)
+
+#define MftEntryDirty(me)		test_bit(ME_dirty, &(me)->m_flags)
+#define SetMftEntryDirty(me)		set_bit(ME_dirty, &(me)->m_flags)
+#define ClearMftEntryDirty(me)		clear_bit(ME_dirty, &(me)->m_flags)
+
+extern void __set_mft_entry_dirty(mft_entry *);
+
+static inline void set_mft_entry_dirty(mft_entry *me)
+{
+	if (!test_and_set_bit(ME_dirty, &me->m_flags))
+		__set_mft_entry_dirty(me);
+}
+
+typedef struct {
+	MFT_RECORD *m_rec;
+	rw_semaphore m_rec_sem;
+ 	unsigned int m_flags; /* mapped, dirty */
+	MFT_REFERENCE m_ref;
+ 	atomic_t m_count;
+ 	struct list_head m_list;
+	ntfs_volume *m_vol;
+} mft_entry;
+
+typedef struct {
+	MFT_REFERENCE *f_mft_refs;
+	mft_erntry *f_mft_entries;
+	int f_nr_mft_refs;
+	rw_semaphore f_sem;
+	atomic_t f_count;
+	struct list_head f_list;
+} ntfs_file;
+
+/**
+ * ntfs_open_by_mref - open an ntfs file, i.e. mft record, given a mft reference
+ * @vol:	ntfs volume to operate on
+ * @mref:	mft_reference of base mft record to open
+ *
+ * Open an ntfs_file (using file to mean any base mft record) given the mft
+ * reference of the mft record (i.e. the inode number). To do this allocate an
+ * ntfs_file structure (adding it to the vol->open_files array), or if the file
+ * is already loaded, just find it in the vol->open_/closed_files arrays.
+ *
+ * Return a pointer to the ntfs_file structure in the vol->open_files array.
+ * This pointer should be treated completely opaquely by the user! Never
+ * use it for anything except as a parameter to functions taking a ntfs_file
+ * pointer as a parameter.
+ */
+ntfs_file *ntfs_open_by_mref(const ntfs_volume *vol, const MFT_REFERENCE *mref);
+
+/**
+ * ntfs_close - close an ntfs_file
+ * @vol:	ntfs volume to operate on
+ * @fref:	ntfs_file pointer to close
+ *
+ * Close a previously opened ntfs file. Return zero on success or -ERRNO on
+ * error, where ERRNO is the error number.
+ */
+int ntfs_close(ntfs_file *fref);
 
 #endif /* defined MFT_H */

Index: volume.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/volume.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -U2 -r1.5 -r1.6
--- volume.h	2001/04/02 02:04:37	1.5
+++ volume.h	2001/04/03 22:41:30	1.6
@@ -24,4 +24,7 @@
 
 #include <stdio.h>
+#include <asm/atomic.h>
+#include <asm/semaphore.h>
+#include <linux/list.h>
 
 #include "attrib.h"
@@ -81,5 +84,5 @@
 				   same interpretation as the lcn_bitmap above
 				   but except that it keeps track of the usage
-				   of the mft recoreds rather than the lcns. */
+				   of the mft records rather than the lcns. */
 	run_list mft_runlist;	/* Decompressed run list of the data attribute
 				   of FILE_$Mft. */
@@ -97,5 +100,31 @@
 					   or 0 if a mft record is smaller than
 					   a cluster. */
-	
+ 	struct list_head open_files;	/* Linked list of ntfs_file struct
+					   pointers, keeping track of all files
+					   which have been loaded into memory
+					   and are open. */
+ 	int nr_open_files;		/* Number of open files. */
+	struct list_head closed_files;	/* Linked list of ntfs_file struct
+					   pointers, keeping track of all cached
+					   files which are not open any more. */	int nr_closed_files;		/* Number of closed files. */
+	int max_files;			/* Maximum number of nr_open_files + nr_					   closed_files. */
+	rw_semaphore files_sem;		/* Read write semaphore to serialize
+					   access to open_files, nr_open_files,
+					   closed_files, nr_closed_files and
+					   max_files). */
+ 	struct list_head mft_entries;	/* Linked list of all loaded mft records
+					   (disk inodes) in order of ascending
+					   mft record number (disk inode number,
+					   disregarding the sequence number).
+					   Note, the list members are mft_entry
+					   struct pointers. */
+	int nr_mft_entries;		/* Number of mft_entries. */
+ 	struct list_head dirty_mft_entries; /* Linked list of all loaded mft
+					   records which are dirty. */
+ 	int nr_dirty_mft_entries;	/* Number of dirty mft_entries. */
+	rw_semaphore mft_entries_sem;	/* Read write semaphore to serialize
+					   access to mft_entries,
+					   nr_mft_entries and their dirty
+					   equivalents. */
 } ntfs_volume;
 

[Linux-NTFS-cvs] CVS: linux-ntfs/ntfstools ntfsfix.c,1.10,1.11

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs/ntfstools
In directory usw-pr-cvs1:/tmp/cvs-serv13207

Modified Files:
	ntfsfix.c 
Log Message:
Fixed a braino the compiler didn't catch...


Index: ntfsfix.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfsfix.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -U2 -r1.10 -r1.11
--- ntfsfix.c	2001/04/02 02:38:39	1.10
+++ ntfsfix.c	2001/04/02 23:02:41	1.11
@@ -133,5 +133,6 @@
 	/* Read $MFT and $MFTmirr. */
 	printf("Going to read $Mft... ");
-	br = get_mft_records(vol, b1, 0, 4);
+	*(__u64*)&mref = FILE_$Mft;
+	br = get_mft_records(vol, b1, &mref, 4);
 	if (br != 4) {
 		puts(FAILED);
@@ -311,5 +312,5 @@
 	/* Write $Volume to $Mft. */
 	printf("Writing $Volume to $Mft... ");
-	*(__u64*)&mref = 3ULL;
+	*(__u64*)&mref = FILE_$Volume;
 	br = put_mft_record(vol, b1 + (3 * mrs), &mref);
 	if (br != 1) {

[Linux-NTFS-cvs] CVS: linux-ntfs/include attrib.h,1.20,1.21

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv7793

Modified Files:
	attrib.h 
Log Message:
Added cvs Id header and removed some outofdate stuff.


Index: attrib.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/attrib.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -U2 -r1.20 -r1.21
--- attrib.h	2001/04/02 02:04:37	1.20
+++ attrib.h	2001/04/02 22:28:39	1.21
@@ -1,3 +1,5 @@
 /*
+ * $Id$
+ *
  * attrib.h - Exports for attribute handling. Part of the Linux-NTFS project.
  *
@@ -1718,22 +1720,5 @@
  * Return 1 on success or 0 on error.
  */
-int set_ntfs_volume_flags(ntfs_volume *v, MFT_RECORD *b,
-			  const __u16 flags);
-
-typedef enum {
-	INSTANCE_MASK	= 0x0000ffff, /* Mask to obtain the __u16 instance. */
-	EXTENT_MASK	= 0x0000ffff, /* Mask to obtain the __u16 extent
-					 number. */
-	IN_ATTR_LIST	= 0x00010000, /* Means that the instance number is in
-				         the attribute list i.e. the attribute
-					 is not in the base mft record. */
-	IN_EXTENT_LIST	= 0x00020000, /* When not set the lower 16-bits contain
-					 the instance number. When set the
-					 instance number is 0 and the lower
-					 16-bits contain the number of the
-				         last found extent. Only defined when
-				         IN_ATTR_LIST is set. */
-	FIRST_SEARCH	= 0xffffffff, /* Indicates the first search (= -1). */
-} FIND_ATTR_CTX_FLAGS;
+int set_ntfs_volume_flags(ntfs_volume *v, MFT_RECORD *b, const __u16 flags);
 
 /**

[Linux-NTFS-cvs] CVS: linux-ntfs/ntfstools ntfsfix.c,1.9,1.10

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs/ntfstools
In directory usw-pr-cvs1:/tmp/cvs-serv20580

Modified Files:
	ntfsfix.c 
Log Message:
I think version reporting is now fixed.


Index: ntfsfix.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfsfix.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -U2 -r1.9 -r1.10
--- ntfsfix.c	2001/04/02 02:20:53	1.9
+++ ntfsfix.c	2001/04/02 02:38:39	1.10
@@ -64,8 +64,7 @@
 {
 	const char *EXEC_NAME = "NtfsFix";
-	char *EXEC2_VERSION = "$Revision$";
-	char *EXEC_VERSION + 11;
 	const char *OK = "OK";
 	const char *FAILED = "FAILED";
+	char *EXEC_REVISION, *EXEC_VERSION;
 	unsigned char *b1 = NULL;
 	unsigned char *b2 = NULL;
@@ -80,4 +79,6 @@
 	MFT_REFERENCE mref;
 
+	EXEC_REVISION = strdup("$Revision$");
+	EXEC_VERSION = EXEC_REVISION + 11;
 	EXEC_VERSION[strlen(EXEC_VERSION) - 2] = '\0';
 	printf("\n");
@@ -106,4 +107,5 @@
 		       EXEC_NAME, EXEC_NAME);
 		fprintf(stderr, "Error: incorrect syntax\n");
+		free(EXEC_REVISION);
 		exit(1);
 	}
@@ -111,4 +113,5 @@
 	if (!vol) {
 		perror("ntfs_mount() failed");
+		free(EXEC_REVISION);
 		exit(1);
 	}
@@ -428,4 +431,5 @@
 	if (vol)
 		ntfs_umount(vol, 0);
+	free(EXEC_REVISION);
 	return i;
 error_exit: