vserver 1.9.3

[linux-2.6.git] / fs / ntfs / types.h

diff --git a/fs/ntfs/types.h b/fs/ntfs/types.h
index a33fc63..a98731e 100644 (file)
--- a/fs/ntfs/types.h
+++ b/fs/ntfs/types.h
@@ -23,8 +23,17 @@
 #ifndef _LINUX_NTFS_TYPES_H
 #define _LINUX_NTFS_TYPES_H
 
+#include <linux/types.h>
+
+typedef __le16 le16;
+typedef __le32 le32;
+typedef __le64 le64;
+typedef __u16 __bitwise sle16;
+typedef __u32 __bitwise sle32;
+typedef __u64 __bitwise sle64;
+
 /* 2-byte Unicode character type. */
-typedef u16 ntfschar;
+typedef le16 ntfschar;
 #define UCHAR_T_SIZE_BITS 1
 
 /*
@@ -32,7 +41,9 @@ typedef u16 ntfschar;
  * and VCN, to allow for type checking and better code readability.
  */
 typedef s64 VCN;
+typedef sle64 leVCN;
 typedef s64 LCN;
+typedef sle64 leLCN;
 
 /*
  * The NTFS journal $LogFile uses log sequence numbers which are signed 64-bit
@@ -40,9 +51,10 @@ typedef s64 LCN;
  * code readability.
  */
 typedef s64 LSN;
+typedef sle64 leLSN;
 
 /**
- * run_list_element - in memory vcn to lcn mapping array element
+ * runlist_element - in memory vcn to lcn mapping array element
  * @vcn:       starting vcn of the current array element
  * @lcn:       starting lcn of the current array element
  * @length:    length in clusters of the current array element
@@ -56,18 +68,18 @@ typedef struct {    /* In memory vcn to lcn mapping structure element. */
        VCN vcn;        /* vcn = Starting virtual cluster number. */
        LCN lcn;        /* lcn = Starting logical cluster number. */
        s64 length;     /* Run length in clusters. */
-} run_list_element;
+} runlist_element;
 
 /**
- * run_list - in memory vcn to lcn mapping array including a read/write lock
- * @rl:                pointer to an array of run list elements
+ * runlist - in memory vcn to lcn mapping array including a read/write lock
+ * @rl:                pointer to an array of runlist elements
  * @lock:      read/write spinlock for serializing access to @rl
  *
  */
 typedef struct {
-       run_list_element *rl;
+       runlist_element *rl;
        struct rw_semaphore lock;
-} run_list;
+} runlist;
 
 typedef enum {
        FALSE = 0,