fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/fs/jfs/jfs_dtree.h b/fs/jfs/jfs_dtree.h
index d7bc0cf..af8513f 100644 (file)
--- a/fs/jfs/jfs_dtree.h
+++ b/fs/jfs/jfs_dtree.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_DTREE
@@ -47,7 +47,7 @@ typedef union {
 struct dtslot {
        s8 next;                /* 1: */
        s8 cnt;                 /* 1: */
-       wchar_t name[15];       /* 30: */
+       __le16 name[15];        /* 30: */
 };                             /* (32) */
 
 
@@ -67,7 +67,7 @@ struct idtentry {
 
        s8 next;                /* 1: */
        u8 namlen;              /* 1: */
-       wchar_t name[11];       /* 22: 2-byte aligned */
+       __le16 name[11];        /* 22: 2-byte aligned */
 };                             /* (32) */
 
 #define DTIHDRSIZE     10
@@ -80,14 +80,14 @@ struct idtentry {
 /*
  *     leaf node entry head/only segment
  *
- *     For legacy filesystems, name contains 13 wchars -- no index field
+ *     For legacy filesystems, name contains 13 wchars -- no index field
  */
 struct ldtentry {
-       u32 inumber;            /* 4: 4-byte aligned */
+       __le32 inumber;         /* 4: 4-byte aligned */
        s8 next;                /* 1: */
        u8 namlen;              /* 1: */
-       wchar_t name[11];       /* 22: 2-byte aligned */
-       u32 index;              /* 4: index into dir_table */
+       __le16 name[11];        /* 22: 2-byte aligned */
+       __le32 index;           /* 4: index into dir_table */
 };                             /* (32) */
 
 #define DTLHDRSIZE     6
@@ -113,7 +113,7 @@ struct dir_table_slot {
        u8 flag;                /* 1: 0 if free */
        u8 slot;                /* 1: slot within leaf page of entry */
        u8 addr1;               /* 1: upper 8 bits of leaf page address */
-       u32 addr2;              /* 4: lower 32 bits of leaf page address -OR-
+       __le32 addr2;           /* 4: lower 32 bits of leaf page address -OR-
                                   index of next entry when this entry was deleted */
 };                             /* (8) */
 
@@ -151,7 +151,7 @@ typedef union {
                s8 freecnt;     /* 1: free count */
                s8 freelist;    /* 1: freelist header */
 
-               u32 idotdot;    /* 4: parent inode number */
+               __le32 idotdot; /* 4: parent inode number */
 
                s8 stbl[8];     /* 8: sorted entry index table */
        } header;               /* (32) */
@@ -192,8 +192,8 @@ typedef union {
  */
 typedef union {
        struct {
-               s64 next;       /* 8: next sibling */
-               s64 prev;       /* 8: previous sibling */
+               __le64 next;    /* 8: next sibling */
+               __le64 prev;    /* 8: previous sibling */
 
                u8 flag;        /* 1: */
                u8 nextindex;   /* 1: next entry index in stbl */
@@ -269,11 +269,4 @@ extern int dtModify(tid_t tid, struct inode *ip, struct component_name * key,
                    ino_t * orig_ino, ino_t new_ino, int flag);
 
 extern int jfs_readdir(struct file *filp, void *dirent, filldir_t filldir);
-
-#ifdef  _JFS_DEBUG_DTREE
-extern int dtDisplayTree(struct inode *ip);
-
-extern int dtDisplayPage(struct inode *ip, s64 bn, dtpage_t * p);
-#endif                         /* _JFS_DEBUG_DTREE */
-
 #endif                         /* !_H_JFS_DTREE */