fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/fs/jfs/jfs_xtree.h b/fs/jfs/jfs_xtree.h
index 7ae64d5..164f6f2 100644 (file)
--- a/fs/jfs/jfs_xtree.h
+++ b/fs/jfs/jfs_xtree.h
@@ -1,18 +1,18 @@
 /*
- *   Copyright (c) International Business Machines Corp., 2000-2002
+ *   Copyright (C) International Business Machines Corp., 2000-2002
  *
  *   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
- *   the Free Software Foundation; either version 2 of the License, or 
+ *   the Free Software Foundation; either version 2 of the License, or
  *   (at your option) any later version.
- * 
+ *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
  *   the GNU General Public License for more details.
  *
  *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software 
+ *   along with this program;  if not, write to the Free Software
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 #ifndef _H_JFS_XTREE
@@ -32,10 +32,10 @@ typedef struct xad {
        unsigned flag:8;        /* 1: flag */
        unsigned rsvrd:16;      /* 2: reserved */
        unsigned off1:8;        /* 1: offset in unit of fsblksize */
-       u32 off2;               /* 4: offset in unit of fsblksize */
+       __le32 off2;            /* 4: offset in unit of fsblksize */
        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 */
 } xad_t;                       /* (16) */
 
 #define MAXXLEN         ((1 << 24) - 1)
@@ -90,14 +90,14 @@ struct xadlist {
  */
 typedef union {
        struct xtheader {
-               s64 next;       /* 8: */
-               s64 prev;       /* 8: */
+               __le64 next;    /* 8: */
+               __le64 prev;    /* 8: */
 
                u8 flag;        /* 1: */
                u8 rsrvd1;      /* 1: */
-               s16 nextindex;  /* 2: next index = number of entries */
-               s16 maxentry;   /* 2: max number of entries */
-               s16 rsrvd2;     /* 2: */
+               __le16 nextindex;       /* 2: next index = number of entries */
+               __le16 maxentry;        /* 2: max number of entries */
+               __le16 rsrvd2;  /* 2: */
 
                pxd_t self;     /* 8: self */
        } header;               /* (32) */
@@ -131,10 +131,4 @@ extern int xtRelocate(tid_t tid, struct inode *ip,
 extern int xtAppend(tid_t tid,
                    struct inode *ip, int xflag, s64 xoff, int maxblocks,
                    int *xlenp, s64 * xaddrp, int flag);
-
-#ifdef  _JFS_DEBUG_XTREE
-extern int xtDisplayTree(struct inode *ip);
-extern int xtDisplayPage(struct inode *ip, s64 bn, xtpage_t * p);
-#endif                         /* _JFS_DEBUG_XTREE */
-
 #endif                         /* !_H_JFS_XTREE */