patch-2_6_7-vs1_9_1_12

[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..3fefbf0 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,9 +34,12 @@
 
 /*
  * 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
@@ -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];
 };