Update files for 1.26 release.

25 files changed, 175 insertions, 52 deletions

diff --git a/ChangeLog b/ChangeLog
index 3f2ec6d6..829e4c98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-02-03  Theodore Tso  <tytso@thunk.org>
+
+	* Release of E2fsprogs 1.26
+
 2001-12-24  Theodore Tso  <tytso@valinux.com>
 
 	* MCONFIG.in (ALL_CFLAGS): No longer put $(top_srcdir)/include in
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 9028fc5a..50004bcb 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,5 +1,5 @@
-E2fsprogs 1.26-WIP (December 24, 2001)
-======================================
+E2fsprogs 1.26 (February 3, 2001)
+=================================
 
 Dumpe2fs will keep going now if the bad block inode can't be read.
 (Previously it stopped with a fatal error.)
@@ -43,6 +43,12 @@ stupid operators with superuser bits, etc.
 Fix a bug in fsck where it would not support a filesystem type of
 "auto" if the device was specified in terms of LABEL=xxx or UUID=xxx.
 
+Fsck now supports fstab entries of the form "ext3,ext2".  It will also
+automatically identify reiserfs filesystems.
+
+The number of processes spawned by fsck can now be limited using the
+FSCK_MAX_INST environment variable.
+
 Fsck now searchs the LVM proc hierarchy to find logical volumes which
 should be searched for  UUID and label information.
 
@@ -76,6 +82,9 @@ system administrator has done something stupid like creating device
 file aliases in their home directory.  Also now checks for swap devices
 by using /proc/swaps.  (Addresses Debian bug #106622)
 
+Added a new option (-T) to tune2fs which sets the time a filesystem
+was last checked.
+
 Speed up e2image when creating sparse raw image files by optimizing
 away excess lseek() system calls.
 
@@ -91,6 +100,18 @@ superblock fields which can be set using the command.
 Debugfs's rm and kill_file command now updates the superblock free block
 and inode counts, thus keeping the filesystem consistent.
 
+Debugfs's lsdel command now takes an optional argument which allows
+the user to only see the most recently deleted files.
+
+A new command (undel) was added to debugfs which automates
+undeleting a deleted inode and linking it back to a directory.
+
+Debugfs's ls command now takes a new option, -d, which lists 
+deleted directory entries.
+
+Debugfs's testb, freeb, setb, and find_free_block commands now take an
+optional count argument.
+
 Add support for a new ext2 file attribute, EXT2_NOTAIL_FL, which will
 be used to signal that a particular inode should not be eligible for
 tail-merging --- this is needed for programs like LILO.
@@ -123,6 +144,24 @@ modifies the behaviour of ext2fs_mkdir(), but if we add any file
 creation functions to libext2fs, we should also make sure they respect
 the umask setting.
 
+The build-rpm script was fixed to be a bit more safe.
+
+The tests' Makefile now has a way of automating test case creation 
+for e2fsck, using "make testnew".
+
+Created a new function, ext2fs_dir_iterate2 which passes more
+information to the callback function (identical to the one used by
+ext2fs_dblist_dir_iterate).  The directory iterator functions take a
+new flag, DIRENT_FLAG_INCLUDE_REMOVED, which will return deleted
+directory entries.  If the directory entry is deleted, the callback
+function will be called with the entry paraemter set to
+DIRENT_DELETED_FILE.
+  
+Added new functions, ext2fs_inode_alloc_stats and
+ext2fs_block_alloc_stats, which takes updates block/inode allocation
+statistics in the bitmaps, block group descriptors, and superblock
+when inodes or blocks are allocated or deallocated.
+
 
 E2fsprogs 1.25 (September 20, 2001)
 ===================================
diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 36ea208b..640f63a0 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,7 @@
+2002-02-03  Theodore Tso  <tytso@thunk.org>
+
+	* Release of E2fsprogs 1.26
+
 2001-09-20  Theodore Tso  <tytso@thunk.org>
 
 	* Release of E2fsprogs 1.25
diff --git a/debugfs/ChangeLog b/debugfs/ChangeLog
index 82149ea7..45bb67f3 100644
--- a/debugfs/ChangeLog
+++ b/debugfs/ChangeLog
@@ -1,3 +1,7 @@
+2002-02-03  Theodore Tso  <tytso@thunk.org>
+
+	* Release of E2fsprogs 1.26
+
 2002-01-03  Theodore Tso  <tytso@valinux.com>
 
 	* lsdel.c (do_lsdel): New optional argument which allows the user
diff --git a/doc/ChangeLog b/doc/ChangeLog
index e43c9c9e..be140fb3 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2002-02-03  Theodore Tso  <tytso@thunk.org>
+
+	* Release of E2fsprogs 1.26
+
 2001-12-11  Theodore Tso  <tytso@valinux.com>
 
 	* Add new descriptions for the following functions: 
diff --git a/doc/libext2fs.texinfo b/doc/libext2fs.texinfo
index 2b9f1687..14968d0a 100644
--- a/doc/libext2fs.texinfo
+++ b/doc/libext2fs.texinfo
@@ -31,7 +31,7 @@ END-INFO-DIR-ENTRY
 This file documents the ext2fs library, a library for manipulating the
 ext2 filesystem.
 
-Copyright (C) 1997, 1998, 1999, 2000, 2001 Theodore Ts'o
+Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Theodore Ts'o
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -62,7 +62,7 @@ by the author.
 @title The EXT2FS Library
 @subtitle The EXT2FS Library
 @subtitle Version 1.26
-@subtitle "December 2001
+@subtitle "February 2002
 
 @author by Theodore Ts'o
 
@@ -77,7 +77,7 @@ by the author.
 
 @page
 @vskip 0pt plus 1filll
-Copyright @copyright{} 1997, 1998, 1999, 2000, 2001 Theodore Ts'o
+Copyright @copyright{} 1997, 1998, 1999, 2000, 2001, 2002 Theodore Ts'o
 
 @sp 2
 
diff --git a/e2fsck/ChangeLog b/e2fsck/ChangeLog
index 41734f44..42cf2d4a 100644
--- a/e2fsck/ChangeLog
+++ b/e2fsck/ChangeLog
@@ -1,4 +1,8 @@
-2001-12-24  Theodore Tso  <tytso@valinux.com>
+2002-02-03  Theodore Tso  <tytso@thunk.org>
+
+	* Release of E2fsprogs 1.26
+
+2001-12-24  Theodore Tso  <tytso@mit.edu>
 
 	* unix.c (PRS): Don't allow the -c and -l/-L options to be
 		specified at the same time.
@@ -12,7 +16,7 @@
 		to use -c instead of the -l/-L options since it's too hard
 		for users to get things like the blocksize parameter correct.
 
-2001-12-23  Theodore Tso  <tytso@valinux.com>
+2001-12-23  Theodore Tso  <tytso@mit.edu>
 
 	* util.c (get_backup_sb): This function now searches for the
 		backup superblock by iterating over possible blocksizes
@@ -34,7 +38,7 @@
 		forcibly adds /usr/include to the beginning of the
 		include search path.)
 
-2001-12-21  Theodore Tso  <tytso@valinux.com>
+2001-12-21  Theodore Tso  <tytso@mit.edu>
 
 	* problem.c (fix_problem): Use ctx->filesystem_name if the
 		ctx->device_name is NULL.
@@ -54,7 +58,7 @@
 		PR_0_JOURNAL_RUN and PR_0_JOURNAL_RUN_DEFAULT.  Update
 		problem decription texts.
 
-2001-12-16  Theodore Tso  <tytso@valinux.com>
+2001-12-16  Theodore Tso  <tytso@mit.edu>
 
 	* e2fsck.h (ext2fs_get_refcount_size), unix.c (check_mount, PRS), 
 		pass1.c (adjust_extattr_refcount), 
@@ -70,19 +74,19 @@
 
 	* journal.c (e2fsck_journal_load): Fix an endianness bug.
 
-2001-11-26  Theodore Tso  <tytso@valinux.com>
+2001-11-26  Theodore Tso  <tytso@mit.edu>
 
 	* super.c (check_super_block): Make sure that if the inode table
 		or allocation bitmap is zero, that it is marked as
 		invalid, so that in pass #1, a new bitmap/inode table gets
 		properly allocated.  (Addresses Debian Bug #116975)
 
-2001-11-24  Theodore Tso  <tytso@valinux.com>
+2001-11-24  Theodore Tso  <tytso@mit.edu>
 
 	* e2fsck.8.in: Fix minor typo in man page and clarify device
 		specification.
 
-2001-10-07  Theodore Tso  <tytso@valinux.com>
+2001-10-07  Theodore Tso  <tytso@mit.edu>
 
 	* journal.c (clear_v2_journal_fields, e2fsck_journal_load): If the
 		V2 fields are set on a V1 journal superblock, or an
@@ -92,7 +96,7 @@
 
 	* problem.c, problem.h (PR_0_CLEAR_V2_JOURNAL): Add new problem code.
 
-2001-09-20  Theodore Tso  <tytso@valinux.com>
+2001-09-20  Theodore Tso  <tytso@mit.edu>
 
 	* e2fsck.h, journal.c (e2fsck_move_ext3_journal): Add new function
 		which will automatically relocate the ext3 journal from a
@@ -108,7 +112,7 @@
 
 	* Release of E2fsprogs 1.25
 
-2001-09-19  Theodore Tso  <tytso@valinux.com>
+2001-09-19  Theodore Tso  <tytso@mit.edu>
 
 	* unix.c (main): If a superblock is specified explicitly by the
 		user, don't try to automatically fall back to an
diff --git a/e2fsprogs.lsm b/e2fsprogs.lsm
index ebfe2678..6cd618ea 100644
--- a/e2fsprogs.lsm
+++ b/e2fsprogs.lsm
@@ -1,15 +1,15 @@
 Begin3
 Title:          EXT2 Filesystem utilities
-Version:        1.25
-Entered-date:   20Sep2001
+Version:        1.26
+Entered-date:   03Feb2002
 Description:    The filesystem utilities for the EXT2 filesystem, including 
 		e2fsck, mke2fs, dumpe2fs, fsck, and others.
 Keywords:       utilities, fsck, filesystem, Ext2fs
 Author:         tytso@mit.edu (Theodore Tso)
 Maintained-by:  tytso@mit.edu (Theodore Tso)
 Primary-site:   download.sourceforge.net /pub/sourceforge/e2fsprogs
-		1204kB e2fsprogs-1.25.tar.gz
-                1kB   e2fsprogs-1.25.lsm
+		1372kB e2fsprogs-1.26.tar.gz
+                1kB   e2fsprogs-1.26.lsm
 Alternate-site: 
 Platforms:	linux 1.2.x/1.3.x/2.0.x/2.1.x/2.2.x/2.3.x/2.4.x
 Copying-policy: GPL/LGPL
diff --git a/include/nonunix/ChangeLog b/include/nonunix/ChangeLog
index 8da1a60f..a253e470 100644
--- a/include/nonunix/ChangeLog
+++ b/include/nonunix/ChangeLog
@@ -1,3 +1,7 @@
+2002-02-03  Theodore Tso  <tytso@thunk.org>
+
+	* Release of E2fsprogs 1.26
+
 2001-09-20  Theodore Tso  <tytso@thunk.org>
 
 	* Release of E2fsprogs 1.25
diff --git a/install-utils/ChangeLog b/install-utils/ChangeLog
index 053de502..335ab3d9 100644
--- a/install-utils/ChangeLog
+++ b/install-utils/ChangeLog
@@ -1,3 +1,7 @@
+2002-02-03  Theodore Tso  <tytso@thunk.org>
+
+	* Release of E2fsprogs 1.26
+
 2001-09-20  Theodore Tso  <tytso@thunk.org>
 
 	* Release of E2fsprogs 1.25
diff --git a/intl/ChangeLog b/intl/ChangeLog
index 689de910..c4c7a913 100644
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,3 +1,7 @@
+2002-02-03  Theodore Tso  <tytso@thunk.org>
+
+	* Release of E2fsprogs 1.26
+
 2001-09-20  Theodore Tso  <tytso@thunk.org>
 
 	* Release of E2fsprogs 1.25
diff --git a/lib/ChangeLog b/lib/ChangeLog
index 800cd718..89c00c98 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2002-02-03  Theodore Tso  <tytso@thunk.org>
+
+	* Release of E2fsprogs 1.26
+
 2001-09-20  Theodore Tso  <tytso@thunk.org>
 
 	* Release of E2fsprogs 1.25
diff --git a/lib/e2p/ChangeLog b/lib/e2p/ChangeLog
index 1b2f5145..b23eccec 100644
--- a/lib/e2p/ChangeLog
+++ b/lib/e2p/ChangeLog
@@ -1,8 +1,12 @@
-2001-12-16  Theodore Tso  <tytso@valinux.com>
+2002-02-03  Theodore Tso  <tytso@thunk.org>
+
+	* Release of E2fsprogs 1.26
+
+2001-12-16  Theodore Tso  <tytso@mit.edu>
 
 	* pf.c: Add const to struct flags_name to avoid -Wall complaints.
 
-2001-11-05  Theodore Tso  <tytso@valinux.com>
+2001-11-05  Theodore Tso  <tytso@mit.edu>
 
 	* pf.c: Add a new file attribute, EXT2_NOTAIL_FL
 
diff --git a/lib/et/ChangeLog b/lib/et/ChangeLog
index e9b923c5..0aa811fc 100644
--- a/lib/et/ChangeLog
+++ b/lib/et/ChangeLog
@@ -1,3 +1,7 @@
+2002-02-03  Theodore Tso  <tytso@thunk.org>
+
+	* Release of E2fsprogs 1.26
+
 2001-12-02  Theodore Tso  <tytso@valinux.com>
 
 	* com_err.c (default_com_err_proc): Work around bug in diet libc
diff --git a/lib/ext2fs/ChangeLog b/lib/ext2fs/ChangeLog
index 0319a715..ee2a003f 100644
--- a/lib/ext2fs/ChangeLog
+++ b/lib/ext2fs/ChangeLog
@@ -1,4 +1,8 @@
-2002-01-03  Theodore Tso  <tytso@valinux.com>
+2002-02-03  Theodore Tso  <tytso@thunk.org>
+
+	* Release of E2fsprogs 1.26
+
+2002-01-03  Theodore Tso  <tytso@mit.edu>
 
 	* dir_iterate.c (ext2fs_dir_iterate2, ext2fs_process_dir_block):
 		Add support for a new flag, DIRENT_FLAG_INCLUDE_REMOVED,
@@ -20,7 +24,7 @@
 		ext2fs_update_bb_inode), alloc.c (ext2fs_alloc_block):
 		Update to use new block/inode allocation statistics.
 
-2001-12-24  Theodore Tso  <tytso@valinux.com>
+2001-12-24  Theodore Tso  <tytso@mit.edu>
 
 	* ismounted.c (is_swap_device): New function used by
 		ext2fs_check_if_mounted and ext2fs_check_mount_point which
@@ -41,7 +45,7 @@
 		system administrators who might have created alias
 		devices.
  
-2001-12-23  Theodore Tso  <tytso@valinux.com>
+2001-12-23  Theodore Tso  <tytso@mit.edu>
 
 	* Makefile.in, jfs_user.h: Move linux/jbd.h to
 		ext2fs/kernel-jbd.h, to avoid using the system header
@@ -52,7 +56,7 @@
 	* kernel-jbd.h, kernel-list.h, jfs_compat.h: Move files from
 		include/linux directory.
 
-2001-12-16  Theodore Tso  <tytso@valinux.com>
+2001-12-16  Theodore Tso  <tytso@mit.edu>
 
 	* bitops.h (ext2fs_mark_generic_bitmap, ext2fs_unmark_generic_bitmap),
 		ext_attr.c (ext2fs_read_ext_attr, ext2fs_write_ext_attr),
@@ -61,13 +65,13 @@
 	* Makefile.in, jfs_user.h: linux/jfs.h has been renamed to
 		linux/jbd.h
 
-2001-12-03  Theodore Tso  <tytso@valinux.com>
+2001-12-03  Theodore Tso  <tytso@mit.edu>
 
 	* unix_io.c (unix_open): Make sure the ulimit workaround works
 		regardless of the version of glibc which is used to
 		compild e2fsprogs.
 
-2001-11-26  Theodore Tso  <tytso@valinux.com>
+2001-11-26  Theodore Tso  <tytso@mit.edu>
 
 	* unix_io.c (unix_open): Work around a bug in 2.4.10+ kernels by
 		trying to unset the filesize limit if at all possible,
@@ -75,7 +79,7 @@
 		shouldn't be applied against writes to a block device, but
 		starting in 2.4.10, the kernel is doing this.)
 	
-2001-11-05  Theodore Tso  <tytso@valinux.com>
+2001-11-05  Theodore Tso  <tytso@mit.edu>
 
 	* mkjournal.c (ext2fs_add_journal_inode): When creating a .journal
 		file on adding a journal to an already-mounted filesystem,
@@ -92,13 +96,13 @@
 
 	* Release of E2fsprogs 1.25
 
-2001-09-16  Theodore Tso  <tytso@valinux.com>
+2001-09-16  Theodore Tso  <tytso@mit.edu>
 
 	* ext2_ext_attr.h: Remove unneeded #include of <linux/config.h>
 		which was breaking the build on the Hurd.  (Addresses
 		Debian bug #112414).
 
-2001-09-13  Theodore Ts'o  <tytso@valinux.com>
+2001-09-13  Theodore Ts'o  <tytso@mit.edu>
 
 	* ismounted.c (check_mntent_file): We now validate the entry in
 		/etc/mtab to make sure the filesystem is really mounted,
diff --git a/lib/ext2fs/Makefile.in b/lib/ext2fs/Makefile.in
index 98a8b9c4..dd63edc3 100644
--- a/lib/ext2fs/Makefile.in
+++ b/lib/ext2fs/Makefile.in
@@ -252,6 +252,10 @@ alloc.o: $(srcdir)/alloc.c $(srcdir)/ext2_fs.h \
  $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \
  $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \
  $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/bitops.h
+alloc_stats.o: $(srcdir)/alloc_stats.c $(srcdir)/ext2_fs.h \
+ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \
+ $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/bitops.h
 alloc_tables.o: $(srcdir)/alloc_tables.c $(srcdir)/ext2_fs.h \
  $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \
  $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \
diff --git a/lib/ss/ChangeLog b/lib/ss/ChangeLog
index 270c9481..756bc7d3 100644
--- a/lib/ss/ChangeLog
+++ b/lib/ss/ChangeLog
@@ -1,3 +1,7 @@
+2002-02-03  Theodore Tso  <tytso@thunk.org>
+
+	* Release of E2fsprogs 1.26
+
 2001-09-20  Theodore Tso  <tytso@thunk.org>
 
 	* Release of E2fsprogs 1.25
diff --git a/lib/uuid/ChangeLog b/lib/uuid/ChangeLog
index 5856b99e..dec38ce7 100644
--- a/lib/uuid/ChangeLog
+++ b/lib/uuid/ChangeLog
@@ -1,3 +1,7 @@
+2002-02-03  Theodore Tso  <tytso@thunk.org>
+
+	* Release of E2fsprogs 1.26
+
 2001-09-20  Theodore Tso  <tytso@thunk.org>
 
 	* Release of E2fsprogs 1.25
diff --git a/misc/ChangeLog b/misc/ChangeLog
index ae10356e..1ef6f3b4 100644
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,4 +1,8 @@
-2002-02-03  Theodore Tso  <tytso@valinux.com>
+2002-02-03  Theodore Tso  <tytso@thunk.org>
+
+	* Release of E2fsprogs 1.26
+
+2002-02-03  Theodore Tso  <tytso@mit.edu>
 
 	* fsck.c (interpret_type): Allow filesystems types of the form
 		"ext3,ext2", etc.
@@ -7,7 +11,7 @@
 		specified list of filesystems.  Also add support for
 		identifying reiserfs filesystems.
 
-2002-01-29  Theodore Tso  <tytso@valinux.com>
+2002-01-29  Theodore Tso  <tytso@mit.edu>
 
 	* fsck.c: Allow the number of outstanding processes fs-specific
 		fsck programs to be capped via the FSCK_MAX_INST
@@ -15,23 +19,23 @@
 
 	* fsck.8.in: Document all of the environment variables used by fsck.
 
-2002-01-27  Theodore Tso  <tytso@valinux.com>
+2002-01-27  Theodore Tso  <tytso@mit.edu>
 
 	* tune2fs.8.in: Document the -f flag to tune2fs.
 
-2002-01-02  Theodore Tso  <tytso@valinux.com>
+2002-01-02  Theodore Tso  <tytso@mit.edu>
 
 	* badblocks.c (main): Open the device as O_RDWR if possible, since
 		fsync() isn't guaranteed to work if the filesystem is
 		opened read-only.
 
-2001-12-26  Theodore Tso  <tytso@valinux.com>
+2001-12-26  Theodore Tso  <tytso@mit.edu>
 
 	* tune2fs.8.in, tune2fs.c (parse_tune2fs_options, main): Add
 		support for new option, -T, which allows the user to set
 		the last checked time on the filesystem.
 
-2001-12-24  Theodore Tso  <tytso@valinux.com>
+2001-12-24  Theodore Tso  <tytso@mit.edu>
 
 	* mke2fs.c (main, test_disk): If two -c options are
 		specified, then perform a destructive read/write test
@@ -50,7 +54,7 @@
 		directory, and the system administrator may not deal with
 		immediately.  (Addresses Debian bug #118443)
 
-2001-12-23  Theodore Tso  <tytso@valinux.com>
+2001-12-23  Theodore Tso  <tytso@mit.edu>
 
 	* Makefile.in, jfs_user.h: Move linux/jbd.h to
 		ext2fs/kernel-jbd.h, to avoid using the system header
@@ -58,20 +62,20 @@
 		forcibly adds /usr/include to the beginning of the
 		include search path.)
 
-2001-12-22  Theodore Tso  <tytso@valinux.com>
+2001-12-22  Theodore Tso  <tytso@mit.edu>
 
 	* get_device_by_label.c (init_lvm): Add support to read out
 		information from the LVM proc hierarchy, so that the UUID
 		cache can search the LVM logical volumes for UUID's,
 		labels, etc.
 
-2001-12-21  Theodore Tso  <tytso@valinux.com>
+2001-12-21  Theodore Tso  <tytso@mit.edu>
 
 	* dumpe2fs.c (list_bad_blocks): Change to not die if the listing
 		of the bad blocks can't be found.  Slimmed down dumpe2fs
 		by eliminating duplicate code paths.  
 
-2001-12-16  Theodore Tso  <tytso@valinux.com>
+2001-12-16  Theodore Tso  <tytso@mit.edu>
 
 	* dumpe2fs.c (list_desc), fsck.c (fs_match),
 		get_device_by_label.c (get_label_uuid), 
@@ -85,23 +89,23 @@
 	* Makefile.in, jfs_user.h: linux/jfs.h has been renamed to
 		linux/jbd.h
 
-2001-12-02  Theodore Tso  <tytso@valinux.com>
+2001-12-02  Theodore Tso  <tytso@mit.edu>
 
 	* dumpe2fs.c: Don't print the offset to the bitmap and inode table
 		if it's negative.  Also did some generalized code clean up
 		to slim it down the support of the -x option.
 
-2001-11-24  Theodore Tso  <tytso@valinux.com>
+2001-11-24  Theodore Tso  <tytso@mit.edu>
 
 	* e2image.8.in: Fix cut-and-paste typo (Addresses Debian bug
 		#119624)
 
-2001-11-13  Theodore Tso  <tytso@valinux.com>
+2001-11-13  Theodore Tso  <tytso@mit.edu>
 
 	* util.c (check_plausibility): Use stat64 if available so that
 		check_plausibility() works with files > 2GB.
 
-2001-11-05  Theodore Tso  <tytso@valinux.com>
+2001-11-05  Theodore Tso  <tytso@mit.edu>
 
 	* chattr.1.in: Update the man page to document the EXT2_NOTAIL_FL
 		flag.
@@ -113,7 +117,7 @@
 		specifications which use LABEL= or UUID= are translated
 		into a real device name.
 
-2001-10-12  Theodore Tso  <tytso@valinux.com>
+2001-10-12  Theodore Tso  <tytso@mit.edu>
 
 	* e2image.c (output_meta_data_blocks): Optimize away excess
 		lseek() calls when creating a sparse file.  Fewer system
@@ -129,7 +133,7 @@
 
 	* Release of E2fsprogs 1.25
 
-2001-09-19  Theodore Tso  <tytso@valinux.com>
+2001-09-19  Theodore Tso  <tytso@mit.edu>
 
 	* tune2fs.c (remove_journal_inode): Remove dead code that wasn't
 		in use.
@@ -137,7 +141,7 @@
 	* tune2fs.8.in: Update man page to reflect the fact that adding or
 		removing a journal doesn't require running e2fsck.
 
-2001-09-13  Theodore Tso  <tytso@valinux.com>
+2001-09-13  Theodore Tso  <tytso@mit.edu>
 
 	* mke2fs.c (zap_sector): Allocate sufficient space for 
 		zero-filled buffer.
diff --git a/po/ChangeLog b/po/ChangeLog
index 66c52e37..8a28fdf2 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2002-02-03  Theodore Tso  <tytso@thunk.org>
+
+	* Release of E2fsprogs 1.26
+
 2001-09-20  Theodore Tso  <tytso@thunk.org>
 
 	* Release of E2fsprogs 1.25
diff --git a/resize/ChangeLog b/resize/ChangeLog
index c8ab4b9a..4c73ed30 100644
--- a/resize/ChangeLog
+++ b/resize/ChangeLog
@@ -1,3 +1,7 @@
+2002-02-03  Theodore Tso  <tytso@thunk.org>
+
+	* Release of E2fsprogs 1.26
+
 2001-09-20  Theodore Tso  <tytso@thunk.org>
 
 	* Release of E2fsprogs 1.25
diff --git a/tests/ChangeLog b/tests/ChangeLog
index cf633d54..0ca095e5 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+2002-02-03  Theodore Tso  <tytso@thunk.org>
+
+	* Release of E2fsprogs 1.26
+
 2002-01-06  Andreas Dilger  <adilger@turbolinux.com>
 
 	* Makefile: Add new target "make testnew" which will create a new
@@ -5,7 +9,7 @@
 		the test filesystem is appropriately "broken" the new
 		target "make testend" will create expect files for it.
 
-2001-12-16  Theodore Tso  <tytso@valinux.com>
+2001-12-16  Theodore Tso  <tytso@mit.edu>
 
 	* f_ext_journal: Add new test which checks e2fsck's ability to use
 		an external journal.
@@ -14,19 +18,19 @@
 
 	* f_badorphan: Revert previous, erroneous change.
 
-2001-11-30  Theodore Tso  <tytso@valinux.com>
+2001-11-30  Theodore Tso  <tytso@mit.edu>
 
 	* f_badorphan, f_journal: Update expect files to reflect the fact
 		that new e2fsck's will move the .journal file to a hidden
 		inode.
 
-2001-11-26  Theodore Tso  <tytso@valinux.com>
+2001-11-26  Theodore Tso  <tytso@mit.edu>
 
 	* f_miss_blk_bmap: Add new test which checks for bug in e2fsck
 		where it wouldn't allocate a missing block bitmap on
 		filesystems with a blocksize of 2k or 4k.
 
-2001-10-07  Theodore Tso  <tytso@valinux.com>
+2001-10-07  Theodore Tso  <tytso@mit.edu>
 
 	* f_bad_local_jnl: New test which tests for a V2 journal with bad
 		fields caused by a botched V1->V2 upgrade.
diff --git a/tests/progs/ChangeLog b/tests/progs/ChangeLog
index a643d9eb..48dc3275 100644
--- a/tests/progs/ChangeLog
+++ b/tests/progs/ChangeLog
@@ -1,3 +1,7 @@
+2002-02-03  Theodore Tso  <tytso@thunk.org>
+
+	* Release of E2fsprogs 1.26
+
 2001-09-20  Theodore Tso  <tytso@thunk.org>
 
 	* Release of E2fsprogs 1.25
diff --git a/util/ChangeLog b/util/ChangeLog
index e3ad187e..1260db95 100644
--- a/util/ChangeLog
+++ b/util/ChangeLog
@@ -1,3 +1,7 @@
+2002-02-03  Theodore Tso  <tytso@thunk.org>
+
+	* Release of E2fsprogs 1.26
+
 2001-09-20  Theodore Tso  <tytso@thunk.org>
 
 	* Release of E2fsprogs 1.25
diff --git a/version.h b/version.h
index 19f14d3c..4cd5cc79 100644
--- a/version.h
+++ b/version.h
@@ -6,5 +6,5 @@
  * Ts'o.  This file may be redistributed under the GNU Public License.
  */
 
-#define E2FSPROGS_VERSION "1.26-WIP"
-#define E2FSPROGS_DATE "24-Dec-2001"
+#define E2FSPROGS_VERSION "1.26"
+#define E2FSPROGS_DATE "3-Feb-2002"