Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial

[pandora-kernel.git] / fs / jfs / jfs_superblock.h

diff --git a/fs/jfs/jfs_superblock.h b/fs/jfs/jfs_superblock.h
index fcf781b..884fc21 100644 (file)
--- a/fs/jfs/jfs_superblock.h
+++ b/fs/jfs/jfs_superblock.h
@@ -3,16 +3,16 @@
  *
  *   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_SUPERBLOCK
@@ -21,14 +21,14 @@
 /*
  * make the magic number something a human could read
  */
-#define JFS_MAGIC      "JFS1"  /* Magic word */
+#define JFS_MAGIC      "JFS1"  /* Magic word */
 
 #define JFS_VERSION    2       /* Version number: Version 2 */
 
 #define LV_NAME_SIZE   11      /* MUST BE 11 for OS/2 boot sector */
 
-/* 
- *     aggregate superblock 
+/*
+ *     aggregate superblock
  *
  * The name superblock is too close to super_block, so the name has been
  * changed to jfs_superblock.  The utilities are still using the old name.
@@ -40,7 +40,7 @@ struct jfs_superblock {
        __le64 s_size;          /* 8: aggregate size in hardware/LVM blocks;
                                 * VFS: number of blocks
                                 */
-       __le32 s_bsize;         /* 4: aggregate block size in bytes; 
+       __le32 s_bsize;         /* 4: aggregate block size in bytes;
                                 * VFS: fragment size
                                 */
        __le16 s_l2bsize;       /* 2: log2 of s_bsize */
@@ -54,7 +54,7 @@ struct jfs_superblock {
        __le32 s_flag;          /* 4: aggregate attributes:
                                 *    see jfs_filsys.h
                                 */
-       __le32 s_state;         /* 4: mount/unmount/recovery state: 
+       __le32 s_state;         /* 4: mount/unmount/recovery state:
                                 *    see jfs_filsys.h
                                 */
        __le32 s_compress;              /* 4: > 0 if data compression */
@@ -75,11 +75,11 @@ struct jfs_superblock {
        struct timestruc_t s_time;      /* 8: time last updated */
 
        __le32 s_fsckloglen;    /* 4: Number of filesystem blocks reserved for
-                                *    the fsck service log.  
+                                *    the fsck service log.
                                 *    N.B. These blocks are divided among the
                                 *         versions kept.  This is not a per
                                 *         version size.
-                                *    N.B. These blocks are included in the 
+                                *    N.B. These blocks are included in the
                                 *         length field of s_fsckpxd.
                                 */
        s8 s_fscklog;           /* 1: which fsck service log is most recent
@@ -87,7 +87,7 @@ struct jfs_superblock {
                                 *    1 => the first one
                                 *    2 => the 2nd one
                                 */
-       char s_fpack[11];       /* 11: file system volume name 
+       char s_fpack[11];       /* 11: file system volume name
                                 *     N.B. This must be 11 bytes to
                                 *          conform with the OS/2 BootSector
                                 *          requirements
@@ -113,12 +113,9 @@ extern int jfs_mount(struct super_block *);
 extern int jfs_mount_rw(struct super_block *, int);
 extern int jfs_umount(struct super_block *);
 extern int jfs_umount_rw(struct super_block *);
-
-extern int jfs_stop_threads;
-extern struct completion jfsIOwait;
-extern wait_queue_head_t jfs_IO_thread_wait;
-extern wait_queue_head_t jfs_commit_thread_wait;
-extern wait_queue_head_t jfs_sync_thread_wait;
 extern int jfs_extendfs(struct super_block *, s64, int);
 
+extern struct task_struct *jfsIOthread;
+extern struct task_struct *jfsSyncThread;
+
 #endif /*_H_JFS_SUPERBLOCK */