vserver 1.9.5.x5

[linux-2.6.git] / fs / jfs / jfs_types.h

diff --git a/fs/jfs/jfs_types.h b/fs/jfs/jfs_types.h
index 8666ff1..5bfad39 100644 (file)
--- a/fs/jfs/jfs_types.h
+++ b/fs/jfs/jfs_types.h
@@ -1,5 +1,5 @@
 /*
- *   Copyright (c) International Business Machines Corp., 2000-2002
+ *   Copyright (C) International Business Machines Corp., 2000-2004
  *
  *   This program is free software;  you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -34,16 +34,19 @@
 
 /*
  * transaction and lock id's
+ *
+ * Don't change these without carefully considering the impact on the
+ * size and alignment of all of the linelock variants
  */
-typedef uint tid_t;
-typedef uint lid_t;
+typedef u16 tid_t;
+typedef u16 lid_t;
 
 /*
  * Almost identical to Linux's timespec, but not quite
  */
 struct timestruc_t {
-       u32 tv_sec;
-       u32 tv_nsec;
+       __le32 tv_sec;
+       __le32 tv_nsec;
 };
 
 /*
@@ -93,7 +96,7 @@ struct lxdlist {
 typedef struct {
        unsigned len:24;
        unsigned addr1:8;
-       u32 addr2;
+       __le32 addr2;
 } pxd_t;
 
 /* xd_t field construction */
@@ -110,11 +113,12 @@ typedef struct {
 #define        addressPXD(pxd)\
        ( ((s64)((pxd)->addr1)) << 32 | __le32_to_cpu((pxd)->addr2))
 
+#define MAXTREEHEIGHT 8
 /* pxd list */
 struct pxdlist {
        s16 maxnpxd;
        s16 npxd;
-       pxd_t pxd[8];
+       pxd_t pxd[MAXTREEHEIGHT];
 };
 
 
@@ -123,11 +127,11 @@ struct pxdlist {
  */
 typedef struct {
        unsigned flag:8;        /* 1: flags */
-       unsigned rsrvd:24;      /* 3: */
-       u32 size;               /* 4: size in byte */
+       unsigned rsrvd:24;
+       __le32 size;            /* 4: size in byte */
        unsigned len:24;        /* 3: length in unit of fsblksize */
        unsigned addr1:8;       /* 1: address in unit of fsblksize */
-       u32 addr2;              /* 4: address in unit of fsblksize */
+       __le32 addr2;           /* 4: address in unit of fsblksize */
 } dxd_t;                       /* - 16 - */
 
 /* dxd_t flags */
@@ -164,10 +168,10 @@ struct dasd {
        u8 delta;               /* Alert Threshold delta (in percent)   */
        u8 rsrvd1;
        u8 limit_hi;            /* DASD limit (in logical blocks)       */
-       u32 limit_lo;           /* DASD limit (in logical blocks)       */
+       __le32 limit_lo;        /* DASD limit (in logical blocks)       */
        u8 rsrvd2[3];
        u8 used_hi;             /* DASD usage (in logical blocks)       */
-       u32 used_lo;            /* DASD usage (in logical blocks)       */
+       __le32 used_lo;         /* DASD usage (in logical blocks)       */
 };
 
 #define DASDLIMIT(dasdp) \