[Linux-NTFS-cvs] CVS: ntfsprogs/include/ntfs Makefile.am, 1.11, 1.12 bitmap.h, 1.7, 1.8 dir.h, 1.18, 1.19 index.h, 1.12, 1.13 inode.h, 1.25, 1.26 mft.h, 1.8, 1.9 volume.h, 1.23, 1.24

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs/include/ntfs
In directory delta357.server4you.de:/tmp/cvs-serv3555/include/ntfs

Modified Files:
	Makefile.am bitmap.h dir.h index.h inode.h mft.h volume.h 
Log Message:
prepare to Szaka's code merge: remove not working Rich's index code


Index: Makefile.am
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/include/ntfs/Makefile.am,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- Makefile.am	16 Oct 2005 23:33:03 -0000	1.11
+++ Makefile.am	17 Jul 2006 11:49:52 -0000	1.12
@@ -25,11 +25,9 @@ linux_ntfsinclude_HEADERS = \
 	mft.h			\
 	mst.h			\
 	ntfstime.h		\
-	rich.h			\
 	runlist.h		\
 	security.h		\
 	support.h		\
-	tree.h			\
 	types.h			\
 	unistr.h		\
 	version.h		\

Index: bitmap.h
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/include/ntfs/bitmap.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- bitmap.h	3 Nov 2005 19:20:14 -0000	1.7
+++ bitmap.h	17 Jul 2006 11:49:52 -0000	1.8
@@ -131,37 +131,4 @@ static __inline__ int ntfs_bitmap_clear_
 	return ntfs_bitmap_clear_run(na, bit, 1);
 }
 
-
-#ifdef NTFS_RICH
-
-#include "layout.h"
-#include "inode.h"
-
-/**
- * struct ntfs_bmp -
- *
- * a cache for either dir/$BITMAP, $MFT/$BITMAP or $Bitmap/$DATA
- */
-struct ntfs_bmp {
-	ntfs_volume	 *vol;
-	ntfs_attr	 *attr;
-	int		  count;
-	u8		**data;
-	VCN		 *data_vcn;
-};
-
-
-int ntfs_bmp_rollback(struct ntfs_bmp *bmp);
-int ntfs_bmp_commit(struct ntfs_bmp *bmp);
-void ntfs_bmp_free(struct ntfs_bmp *bmp);
-struct ntfs_bmp * ntfs_bmp_create(ntfs_inode *inode, ATTR_TYPES type, ntfschar *name, int name_len);
-int ntfs_bmp_add_data(struct ntfs_bmp *bmp, VCN vcn, u8 *data);
-u8 * ntfs_bmp_get_data(struct ntfs_bmp *bmp, VCN vcn);
-int ntfs_bmp_set_range(struct ntfs_bmp *bmp, VCN vcn, s64 length, int value);
-s64 ntfs_bmp_find_last_set(struct ntfs_bmp *bmp);
-int ntfs_bmp_find_space(struct ntfs_bmp *bmp, LCN start, long size);
-
-#endif /* NTFS_RICH */
-
 #endif /* defined _NTFS_BITMAP_H */
-

Index: dir.h
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/include/ntfs/dir.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- dir.h	30 Jan 2006 22:10:31 -0000	1.18
+++ dir.h	17 Jul 2006 11:49:52 -0000	1.19
@@ -107,37 +107,4 @@ typedef int (*ntfs_filldir_t)(void *dire
 extern int ntfs_readdir(ntfs_inode *dir_ni, s64 *pos,
 		void *dirent, ntfs_filldir_t filldir);
 
-#ifdef NTFS_RICH
-
-/**
- * struct ntfs_dir -
- */
-struct ntfs_dir {
-	ntfs_volume	  *vol;
-	struct ntfs_dir	  *parent;
-	ntfschar	  *name;
-	int		   name_len;
-	MFT_REF		   mft_num;
-	struct ntfs_dt	  *index;
-	struct ntfs_dir	 **children;
-	int		   child_count;
-	struct ntfs_bmp	  *bitmap;
-	ntfs_inode	  *inode;
-	ntfs_attr	  *iroot;
-	ntfs_attr	  *ialloc;
-	int                index_size;
-};
-
-
-int ntfs_dir_rollback(struct ntfs_dir *dir);
-int ntfs_dir_truncate(ntfs_volume *vol, struct ntfs_dir *dir);
-int ntfs_dir_commit(struct ntfs_dir *dir);
-void ntfs_dir_free(struct ntfs_dir *dir);
-struct ntfs_dir * ntfs_dir_create(ntfs_volume *vol, MFT_REF mft_num);
-void ntfs_dir_add(struct ntfs_dir *parent, struct ntfs_dir *child);
-struct ntfs_dir * ntfs_dir_find2(struct ntfs_dir *dir, ntfschar *name, int name_len);
-
-#endif /* NTFS_RICH */
-
 #endif /* defined _NTFS_DIR_H */
-

Index: index.h
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/include/ntfs/index.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- index.h	6 Apr 2006 17:00:39 -0000	1.12
+++ index.h	17 Jul 2006 11:49:52 -0000	1.13
@@ -129,21 +129,4 @@ static inline void ntfs_index_entry_mark
 		ictx->ia_dirty = TRUE;
 }
 
-
-#ifdef NTFS_RICH
-
-#include "layout.h"
-
-void ntfs_ie_free(INDEX_ENTRY *ie);
-INDEX_ENTRY * ntfs_ie_create(void);
-VCN ntfs_ie_get_vcn(INDEX_ENTRY *ie);
-INDEX_ENTRY * ntfs_ie_copy(INDEX_ENTRY *ie);
-INDEX_ENTRY * ntfs_ie_set_vcn(INDEX_ENTRY *ie, VCN vcn);
-INDEX_ENTRY * ntfs_ie_remove_vcn(INDEX_ENTRY *ie);
-INDEX_ENTRY * ntfs_ie_set_name(INDEX_ENTRY *ie, ntfschar *name, int namelen, FILE_NAME_TYPE_FLAGS nametype);
-INDEX_ENTRY * ntfs_ie_remove_name(INDEX_ENTRY *ie);
-
-#endif /* NTFS_RICH */
-
 #endif /* _NTFS_INDEX_H */
-

Index: inode.h
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/include/ntfs/inode.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- inode.h	5 Apr 2006 02:53:40 -0000	1.25
+++ inode.h	17 Jul 2006 11:49:52 -0000	1.26
@@ -187,12 +187,4 @@ extern int ntfs_inode_free_space(ntfs_in
 
 extern int ntfs_inode_badclus_bad(u64 mft_no, ATTR_RECORD *a);
 
-#ifdef NTFS_RICH
-
-int ntfs_inode_close2(ntfs_inode *ni);
-ntfs_inode * ntfs_inode_open2(ntfs_volume *vol, const MFT_REF mref);
-ntfs_inode * ntfs_inode_open3(ntfs_volume *vol, const MFT_REF mref);
-
-#endif /* NTFS_RICH */
-
 #endif /* defined _NTFS_INODE_H */

Index: mft.h
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/include/ntfs/mft.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- mft.h	5 Apr 2006 02:49:24 -0000	1.8
+++ mft.h	17 Jul 2006 11:49:52 -0000	1.9
@@ -113,18 +113,4 @@ extern int ntfs_mft_record_free(ntfs_vol
 
 extern int ntfs_mft_usn_dec(MFT_RECORD *mrec);
 
-#ifdef NTFS_RICH
-
-#include "bitmap.h"
-#include "dir.h"
-
-int ntfs_mft_remove_attr(struct ntfs_bmp *bmp, ntfs_inode *inode, ATTR_TYPES type);
-ATTR_RECORD * ntfs_mft_add_attr(ntfs_inode *inode, ATTR_TYPES type, u8 *data, int data_len);
-int ntfs_mft_resize_resident(ntfs_inode *inode, ATTR_TYPES type, ntfschar *name, int name_len, u8 *data, int data_len);
-int ntfs_mft_free_space(struct ntfs_dir *dir);
-int ntfs_mft_add_index(struct ntfs_dir *dir);
-
-#endif /* NTFS_RICH */
-
 #endif /* defined _NTFS_MFT_H */
-

Index: volume.h
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/include/ntfs/volume.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- volume.h	8 Jan 2006 15:53:28 -0000	1.23
+++ volume.h	17 Jul 2006 11:49:52 -0000	1.24
@@ -228,16 +228,4 @@ extern int ntfs_logfile_reset(ntfs_volum
 
 extern int ntfs_volume_write_flags(ntfs_volume *vol, const u16 flags);
 
-#ifdef NTFS_RICH
-
-int ntfs_volume_commit(ntfs_volume *vol);
-int ntfs_volume_rollback(ntfs_volume *vol);
-int ntfs_volume_umount2(ntfs_volume *vol, const BOOL force);
-ntfs_volume * ntfs_volume_mount2(const char *device, unsigned long flags, BOOL force);
-int utils_valid_device(const char *name, int force);
-ntfs_volume * utils_mount_volume(const char *device, unsigned long flags, BOOL force);
-
-#endif /* NTFS_RICH */
-
 #endif /* defined _NTFS_VOLUME_H */
-