ChangeLog, ext2fs.h:
ext2fs.h: Update to include latest journalling additions to the superblock.
.del-ext2_fs.h~7a460879, ChangeLog:
ext2_fs.h: Update to include latest journalling additions to the
superblock.
diff --git a/include/linux/ChangeLog b/include/linux/ChangeLog
index 8534015..80de664 100644
--- a/include/linux/ChangeLog
+++ b/include/linux/ChangeLog
@@ -1,3 +1,8 @@
+2000-07-04 Theodore Ts'o <tytso@valinux.com>
+
+ * ext2_fs.h: Update to include latest journalling additions to the
+ superblock.
+
2000-04-03 Theodore Ts'o <tytso@valinux.com>
* ext2_fs.h (EXT2_NOCOMPR_FL): Rename EXT2_NOCOMP_FL to
diff --git a/include/linux/ext2_fs.h b/include/linux/ext2_fs.h
index aa0f188..9f89ca1 100644
--- a/include/linux/ext2_fs.h
+++ b/include/linux/ext2_fs.h
@@ -375,12 +375,20 @@
__u32 s_algorithm_usage_bitmap; /* For compression */
/*
* Performance hints. Directory preallocation should only
- * happen if the EXT2_COMPAT_PREALLOC flag is on.
+ * happen if the EXT2_FEATURE_COMPAT_DIR_PREALLOC flag is on.
*/
__u8 s_prealloc_blocks; /* Nr of blocks to try to preallocate*/
__u8 s_prealloc_dir_blocks; /* Nr to preallocate for dirs */
__u16 s_padding1;
- __u32 s_reserved[204]; /* Padding to the end of the block */
+ /*
+ * Journaling support.
+ */
+ __u8 s_journal_uuid[16]; /* uuid of journal superblock */
+ __u32 s_journal_inum; /* inode number of journal file */
+ __u32 s_journal_dev; /* device number of journal file */
+ __u32 s_last_orphan; /* start of list of inodes to delete */
+
+ __u32 s_reserved[197]; /* Padding to the end of the block */
};
#ifdef __KERNEL__
diff --git a/lib/ext2fs/ChangeLog b/lib/ext2fs/ChangeLog
index af3df72..0817d54 100644
--- a/lib/ext2fs/ChangeLog
+++ b/lib/ext2fs/ChangeLog
@@ -1,5 +1,8 @@
2000-07-04 Theodore Ts'o <tytso@valinux.com>
+ * ext2fs.h: Update to include latest journalling additions to the
+ superblock.
+
* dll/jump.funcs: Add new jumptable entries for
ext2fs_write_bb_FILE, ext2fs_read_bb_FILE2, and
ext2fs_badblocks_equal.
diff --git a/lib/ext2fs/ext2fs.h b/lib/ext2fs/ext2fs.h
index 4b1fe6c..b8dbd4d 100644
--- a/lib/ext2fs/ext2fs.h
+++ b/lib/ext2fs/ext2fs.h
@@ -430,7 +430,7 @@
__u32 s_algorithm_usage_bitmap; /* For compression */
/*
* Performance hints. Directory preallocation should only
- * happen if the EXT2_COMPAT_PREALLOC flag is on.
+ * happen if the EXT2_FEATURE_COMPAT_DIR_PREALLOC flag is on.
*/
__u8 s_prealloc_blocks; /* Nr of blocks to try to preallocate*/
__u8 s_prealloc_dir_blocks; /* Nr to preallocate for dirs */
@@ -440,8 +440,10 @@
*/
__u8 s_journal_uuid[16]; /* uuid of journal superblock */
__u32 s_journal_inum; /* inode number of journal file */
+ __u32 s_journal_dev; /* device number of journal file */
+ __u32 s_last_orphan; /* start of list of inodes to delete */
- __u32 s_reserved[199]; /* Padding to the end of the block */
+ __u32 s_reserved[197]; /* Padding to the end of the block */
};
#define EXT2FS_COMPRESSED_BLKADDR ((blk_t) 0xffffffff)