Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv24588/include
Modified Files:
mft.h ntfsd.h volume.h
Log Message:
Ok, ntfsd was a mistake for userspace. It increases complexity no end while
not giving us much functionality. Lets get it working and then worry about the
kernel. - As it was the idea originally anyway, so this is just a return on the
right track. (-8
We keep the timer and signal handler but the only thing we do is to set a bool
flag (ntfs_need_sync) and we will just check this in appropriate places and
if it is true we call ntfs_sync_volumes() which sets it back to false. This
means no more locking at all of any description and no need to worry about the
signal handler interrupting things in bad ways and/or at bad times in the main
code.
Index: mft.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/mft.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -U2 -r1.18 -r1.19
--- mft.h 2001/04/10 22:20:19 1.18
+++ mft.h 2001/04/10 23:37:19 1.19
@@ -25,11 +25,7 @@
#define MFT_H
-#ifndef __KERNEL__
-#define __KERNEL__
-#endif
-
-#include <linux/list.h>
#include <linux/bitops.h>
+#include "list.h"
#include "endians.h"
#include "ntfs_rec.h"
@@ -399,16 +395,20 @@
#define ClearMftEntryError(me) clear_bit(ME_error, &(me)->m_flags)
-typedef struct {
+struct _ntfs_file;
+
+struct {
MFT_RECORD *m_rec;
unsigned int m_flags;
MFT_REFERENCE m_ref;
unsigned int m_count;
- ntfs_file *m_file;
+ struct _ntfs_file *m_file;
struct list_head m_list;
struct list_head m_dirty_list;
- ntfs_volume *m_vol;
-} mft_entry;
+ struct _ntfs_volume *m_vol;
+} _mft_entry;
-typedef struct {
+typedef struct _mft_entry mft_entry;
+
+struct {
MFT_REFERENCE *m_refs;
mft_entry *m_entries;
@@ -416,6 +416,8 @@
int f_count;
struct list_head f_list;
- ntfs_volume *f_vol;
-} ntfs_file;
+ struct _ntfs_volume *f_vol;
+} _ntfs_file;
+
+typedef struct _ntfs_file ntfs_file;
/**
Index: ntfsd.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/ntfsd.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -U2 -r1.6 -r1.7
--- ntfsd.h 2001/04/10 22:20:19 1.6
+++ ntfsd.h 2001/04/10 23:37:19 1.7
@@ -26,6 +26,6 @@
#include <linux/bitops.h>
-#include <linux/list.h>
+#include "list.h"
#include "volume.h"
#include "support.h"
@@ -35,5 +35,5 @@
* walk the dirty list for each mounted volume.
*/
-extern struct listhead ntfs_mounted_volumes;
+extern struct list_head ntfs_mounted_volumes;
extern int nr_ntfs_mounted_volumes;
Index: volume.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/volume.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -U2 -r1.11 -r1.12
--- volume.h 2001/04/10 22:20:19 1.11
+++ volume.h 2001/04/10 23:37:19 1.12
@@ -26,6 +26,6 @@
#include <stdio.h>
-#include <linux/list.h>
+#include "list.h"
#include "attrib.h"
#include "support.h"
@@ -50,5 +50,5 @@
/* The ntfs volume structure describing an open volume. */
-typedef struct {
+struct {
int fd; /* File descriptor associated with volume. */
char *dev_name; /* Name of the device/file the volume is in. */
@@ -114,5 +114,7 @@
struct list_head v_list; /* Anchor for list of all mounted
volumes. */
-} ntfs_volume;
+} _ntfs_volume;
+
+typedef struct _ntfs_volume ntfs_volume;
/**
|
