[Linux-NTFS-cvs] CVS: ntfs-driver-tng/linux/include/linux ntfs_fs.h,1.31,1.32 ntfs_layout.h,1.6,1.7

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

Changes by: antona

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

Modified Files:
	ntfs_fs.h ntfs_layout.h 
Log Message:
Updates.


Index: ntfs_fs.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/include/linux/ntfs_fs.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -U2 -r1.31 -r1.32
--- ntfs_fs.h	2001/08/08 23:50:28	1.31
+++ ntfs_fs.h	2001/08/27 18:39:31	1.32
@@ -30,4 +30,5 @@
 #include <linux/nls.h>
 #include <linux/slab.h>
+#include <linux/pagemap.h>
 
 typedef enum {
@@ -202,8 +203,8 @@
 
 /**
- * ntfs_unmap_page - release a page that was mapped using ntfs_page_map()
+ * ntfs_unmap_page - release a page that was mapped using ntfs_map_page()
  * @page:	the page to release
  *
- * Unpin, unmap and release a page that was obtained from ntfs_page_map().
+ * Unpin, unmap and release a page that was obtained from ntfs_map_page().
  */
 static inline void ntfs_unmap_page(struct page *page)
@@ -257,5 +258,5 @@
 		if (Page_Uptodate(page) && !PageError(page))
 			return page;
-		mapping_put_page(page);
+		ntfs_unmap_page(page);
 		return ERR_PTR(-EIO);
 	}
@@ -367,6 +368,4 @@
 
 #else /* !MDEBUG */
-
-#include <linux/malloc.h>
 
 static inline void *ntfs_malloc(size_t size, int flags)

Index: ntfs_layout.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/include/linux/ntfs_layout.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -U2 -r1.6 -r1.7
--- ntfs_layout.h	2001/08/08 02:51:02	1.6
+++ ntfs_layout.h	2001/08/27 18:39:31	1.7
@@ -1760,4 +1760,5 @@
 	INDEX_NODE	= 1, /* This node indexes other nodes, i.e. is not a
 				leaf node. */
+	NODE_MASK	= 1, /* Mask for accessing the *_NODE bits. */
 } __attribute__ ((__packed__)) INDEX_HEADER_FLAGS;
 
@@ -1782,5 +1783,8 @@
 	   equal, as the attribute is resident and it is resized as needed. In
 	   the case of the index allocation attribute the attribute is not
-	   resident and hence the allocated_size is a fixed value. */
+	   resident and hence the allocated_size is a fixed value and must
+	   equal the index_block_size specified by the INDEX_ROOT attribute
+	   corresponding to the INDEX_ALLOCATION attribute this INDEX_BLOCK
+	   belongs to. */
 	INDEX_HEADER_FLAGS flags;	/* Bit field of INDEX_HEADER_FLAGS. */
 	__u8 reserved[3];		/* Reserved/align to 8-byte boundary. */
@@ -2016,5 +2020,11 @@
 	//		   entries immediately preceding the current entry (the
 	//		   vcn references the corresponding cluster in the data
-	//		   of the non-resident index allocation attribute). */
+	//		   of the non-resident index allocation attribute). If
+	//		   the key_length is zero, then the vcn immediately
+	//		   follows the INDEX_ENTRY_HEADER. Regardless of
+	//		   key_length, the address of the 8-byte boundary
+	//		   alligned vcn of INDEX_ENTRY{_HEADER} *ie is given by
+	//		   (char*)ie + le16_to_cpu(ie*)->length) - sizeof(VCN),
+	//		   where sizeof(VCN) can be hardcoded as 8 if wanted. */
 } __attribute__ ((__packed__)) INDEX_ENTRY;