Merge lp:~smb/ubuntu/natty/e2fsprogs/branch into lp:ubuntu/natty/e2fsprogs

[Stefan Bader]

This is the same code as Lorenzo prepared in bug #681418 (merge of current Debian) with just another vcs-git removed and the intermediate upload added to the changelog.

[Daniel Holbach (dholbach)]

Thanks for your work on this.

As we're very likely to get all the changes in the next upstream release, I'll reject this merge proposal for now.

review: Disapprove

[Daniel Holbach (dholbach)]

(See bug 681418 for more info.)

=== removed file 'README.subset'
--- README.subset	2009-04-29 18:19:46 +0000
+++ README.subset	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-This distribution contains a subset of the e2fsprogs package; it
-contains the base libraries (ss, et, uuid, blkid) which may be used by
-other non-ext2-related applications.
-
-This may be useful for non-Linux operating systems that need these
-libraries for GNOME, but who do not need the ext2/ext3 filesystem
-utilities.
-
-The full e2fsprogs distributions can be found at the e2fsprogs web
-page, which is:
-
-	http://e2fsprogs.sourceforge.net
-
-In case of bugs in these libraries, please contact Ted Ts'o at
[e-mail] or [e-mail].
 
=== modified file 'RELEASE-NOTES'
--- RELEASE-NOTES	2010-06-07 15:49:29 +0000
+++ RELEASE-NOTES	2010-12-13 17:21:59 +0000
@@ -1,5 +1,5 @@
-E2fsprogs 1.41.12 (May 17, 2010) (Up to commit 517be2d)
-=======================================================
+E2fsprogs 1.41.12 (May 17, 2010)
+================================
 
 Mke2fs now gives a correct error message if the external journal
 device is not found.  (Addresses Red Hat Bug #572935)
 
=== removed file 'TODO'
--- TODO	2009-04-29 18:19:46 +0000
+++ TODO	1970-01-01 00:00:00 +0000
@@ -1,277 +0,0 @@
-Need to process the bad block inode *before* doing the inode scan.
-
-Also check to see if the first block of the inode table is not on the
-bad block scan, and fix that.  We need to check for an inaccurate
-blocks, and fix them before we start doing anything else with the
-filesystem!
-
----------------------------------------------------
-User request:
-
-BTW: Could you please add some sort of deleted and possibly corrupted file
-     and inode list to e2fsck report. There should be filenames deleted
-     from directory inodes, files with duplicate blocks e.t.c.
-     It's pretty annoying to filter this information from e2fsck output
-     by hand :-
-
-------------------------------------------
-
-Add a "answer Yes always to this class of question" response.
-
-----------------------------------
-
-ext2fs_flush() should return a different error message for primary
-versus backup superblock flushing, so that mke2fs can print an
-appropriate error message.
-
----------------------------------
-Date: Mon, 08 Mar 1999 21:46:14 +0100
-From: Sergio Polini <[e-mail]>
-
-
-I'm reading the sorce code of e2fsck 1.14.
-In pass2.c, lines 352-357, I read:
-
-if ((dirent->name_len & 0xFF) > EXT2_NAME_LEN) {
-        if (fix_problem(ctx, PR_2_FILENAME_LONG, &cd->pctx)) {
-                dirent->name_len = EXT2_NAME_LEN;
-                dir_modified++;
-        }
-}
-
-I think that I'll never see any messages about too long filenames,
-because "whatever & 0xFF" can never be "> 0xFF".
-Am I wrong?
---------------------------------------
-
-Add chmod command to debugfs.
-
-------------------------------------------
-
-Date: Tue, 18 Jan 2000 17:54:53 -0800 (PST)
-From: Alan Blanchard <[e-mail]>
-To: [e-mail]
-Subject: DEBUGFS - thanks and a feature idea
-Content-Type: TEXT/PLAIN; charset=US-ASCII
-
-Theodore:
-
-First, let me thank you for writing debugfs. Recently, my Linux box
-(RH 6.0, 400 MHz PIII, on a DSL line) was hacked into.  The intruder did
-an "rm -Rf" on a 34 GB drive with about 5GB of data on it.  I was able to
-restore essentially the entire thing with debugfs and a bit of C code and Perl.
-Actually, I could have done the entire thing with debugfs and Perl, but I
-thought it would be too slow.
-
-During this exercise, I noticed that one small feature was lacking that would
-have made my job a bit easier.  The length of a deleted directory is
-reported as 0, hence debugfs won't dump the contents of the directory to a
-file using the "dump" command.  The only thing that saved me was that the
-list of disk blocks is not zeroed out.  I was able to dump the contents of the
-directories by using debugfs to get the relevant block numbers, then
-using dd to get the actual data.
-
-If debugfs had a feature where it ignored the size of a directory reported by
-the inode and instead just dumped all the blocks, it would have facilited
-things a bit. This seems like a very easy feature to add.
-
-Again, thanks for writing debugfs (and all the other Linux stuff you've written!).
-
-Cheers,
-Alan Blanchard
[e-mail]
-
-
--------------------------------------------------------------------
-
-Date: Fri, 21 Jan 2000 14:07:12 -0800
-From: "H. Peter Anvin" <[e-mail]>
-Subject: mkfs -cc and fsck -c
-
-b) An option to mkfs to zero the partition.  Yes, it can be done with
-dd, but it would be a nicer way of doing it.
-
-------------------------------------------------------------------
-
-Add support for in ext2fs_block_iterate() for a returning the
-compressed flag blocks to block_iterate.  Change default to not return
-EXT2_COMPRESSED_BLKADDR.  Change e2fsck to pass this flag in.
-
-(The old compression patches did this by default all the time, which
-is bad, since it meant e2fsck never saw the EXT2_COMPRESSED_BLKADDR
-flagword.
-
-------------------------------------------------------------
-
-E2fsck should offer to clear all the blocks in an indirect block, not
-the entire inode, so there's better recovery for when an indirect
-block gets trashed.
-
-
--------------------------------------------------------------
-
-From: Yann Dirson - LOGATIQUE <[e-mail]>
-Date: Thu, 2 Mar 2000 13:52:13 +0100 (MET)
-
-During my experiments on the broken system, I noticed the following in
-the badblocks program (which I'm aware is not designed for IDE drives)
-- I'd probably have already fixed them if my home system was up :(
-
-* the syntax summary documents 2nd arg as blocks_count, which should
-probably read something like end_count.
-
-* testing past end of device is not detected, and lists those blocks
-as bad, whereas they simply do not exist.
-
-
-I think I'll probably add a "max count" option to findsuper(8), so
-that I do not have to wait for the whole disk to be scanned when the
-system had to be launched with "init=/bin/sh", in which case Ctrl-[CZ]
-and friends appear to be absolutely ignored.
-
-
-Somewhat unrelated, I just noticed the
-http://web.mit.edu/tytso/www/linux/ext2.html could be updated:
-
-- could mention SGI xfs (http://oss.sgi.com/projects/xfs/ - they just
-  release 0.03 snapshot)
-
-----------------------------------------------------------------
-
-Return-Path: <[e-mail]>
-Date: Thu, 10 Feb 2000 13:20:14 -0500
-From: "Theodore Y. Ts'o" <[e-mail]>
-To: [e-mail]
-In-Reply-To: Rogier Wolff's message of Thu, 10 Feb 2000 08:46:30 +0100 (MET),
-	<[e-mail]>
-Subject: Re: e2fsck request for enhancement.
-Phone: [phone]
-
-   Date: Thu, 10 Feb 2000 08:46:30 +0100 (MET)
-   From: [e-mail] (Rogier Wolff)
-
-   Lately, while trying to recover a broken disk, my system froze (twice,
-   until I tried something else) while copying the disk.
-
-   So I had a file of about 50Mb that was growing frantically at the
-   moment of the crash.
-
-   e2fsck, then finds an indirect block that is completely bogus. It
-   starts by asking me if it's ok to clear a few of the referenced
-   blocks. I say yes. Then it comes to the conclusion: 
-
-      too many invalid blocks. Clear inode?
-
-   and then I get the option to delete the whole file. Not to truncate
-   the file to a "working" size.
-
-
-   I'd MUCH rather have e2fsck say something like:
-
-      inode 1234 references an invalid block 134345454. Hmm.
-      inode 1234 references 567 out of 50176 invalid blocks, 
-			  all near the end. Truncate file to 49152 blocks?
-
-   Here you can see that of the 1024 blocks near the end of the file,
-   only 567 were detected as invalid. However now 48Mb of the file will
-   be recovered, instead of thrown away.
-
-That's a good point.  Actually, the right thing is for e2fsck to offer
-to clear all of the bad blocks in a particular indirect block.  I don't
-know how hard it would be to do that, but I'll put it on my e2fsprogs
-TODO list.
-
-							- Ted
-
----------------------------------------------------------------
-From e2fsprogs Debian TODO file as of 1.10-13.
-
-* Maybe make -dbg packages. Look at how others do it.
-
----------------------------------------------------------------
-
-Add --lba option to debian icheck command, and have ways of making it
-easier to translate LBA to filesystem block numbers.
-
--------------------------------------------------------
-
-
-
-List of projects for e2fsprogs:
-
-
-1) Make debugfs's "ncheck <inode>" command list all of the pathnames
-to an inode, not just only the first link to the inode which is found.
-(A good "intro to libext2fs programming interfaces project)
-
-	Difficulty: Low		Priority: Low
-
-2) Use a code coverage tool such as Rational's PureCoverage to see
-what kind of code coverage we have for e2fsck, and try to add test
-cases to increase the code coverage for e2fsck.
-
-	Difficulty: Medium	Priorty: Low
-
-3) Use a code coverage tool such as Rational's PureCoverage to see
-what kind of code coverage we have for resize2fs, and try to add test
-cases to increase the code coverage for resize2fs.
-
-	Difficulty: Medium	Priorty: Medium
-
-4) Create a new I/O manager (i.e., test_io.c, unix_io.c, et.al.) which
-layers on top of an existing I/O manager which provides copy-on-write
-functionality.  This COW I/O manager takes will take two open I/O
-managers, call them "base" and "changed".  The "base" I/O manager is
-opened read/only, so any changes are written instead to the "changed"
-I/O manager, in a compact, non-sparse format containing the intended
-modification to the "base" filesystem.  
-
-This will allow resize2fs to figure out what changes need to made to
-extend a filesystem, or expand the size of inodes in the inode table,
-and the changes can be pushed the filesystem in one fell swoop.  (If
-the system crashes; the program which runs the "changed" file can be
-re-run, much like a journal replay.  My assumption is that the COW
-file will contain the filesystem UUID in a the COW superblock, and the
-COW file will be stored in some place such as /var/state/e2fsprogs,
-with an init.d file to automate the replay so we can recover cleanly
-from a crash during the resize2fs process.)
-
-	Difficulty: Medium	Priority: Medium
-
-5) Create a new I/O manager (i.e., test_io.c, unix_io.c, et.al.) which
-layers on top of an existing I/O manager which provides an "undo"
-functionality.  This undo I/O manager takes will take two open I/O
-managers, call them "base" and "undo".  The "base" I/O manager is be
-opened read/write, and when any writes are sent to the I/O manager,
-the I/O manager will check the "undo" I/O manager, using a file format
-identical to the one found in (5) above.  
-
-This is useful for allowing e2fsck to create an "undo" file, which
-would make things like "e2fsck -y" much safer.
-
-	Difficulty: Low (once 5 is done)  Priority: Low
-
-6) Modify resize2fs so that it can relocate and reorganize the
-filesystem in the following ways: (1) increase the inode size, so that
-an existing filesystem can use the EA-in-inode kernel patch, (2)
-reserve blocks in the resize inode to allow for on-line resizing.  Use
-the COW I/O manager described in (5) in order to provide robustness in
-case of a crash during the resize/reorganization operation.  
-
-	Difficulty: High	Priority: Medium
-
-7) Review the EA-in-inode patches to e2fsck for correctness/code
-cleanliness.  (I will probably have to do this myself -- Ted)
-
-	Difficulty: High	Priorty: Medium
-
-8) Add support for extent maps to e2fsprogs.  I need to review the
-extent maps first/in parallel. 
-
-	Difficulty: High	Priority: Medium
-
-----------------------------------
-
-Need to deal with the case where the resize inode overlaps with the
-bad blocks inode.
-
 
=== modified file 'debian/changelog'
--- debian/changelog	2010-12-13 12:57:53 +0000
+++ debian/changelog	2010-12-13 17:21:59 +0000
@@ -1,3 +1,26 @@
+e2fsprogs (1.41.12-2ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable (LP: #681418), remaining changes:
+    - debian/control: Do not build-depend on dietlibc-dev, which is universe.
+    - debian/rules:
+      + Do now allow pkg-create-dbgsym to operate on this package.
+      + Build with -O2 on powerpc to avoid a suspected toolchain bug.
+    - debian/e2fsprogs.preinst: Do not include /etc/e2fsck.conf and remove on 
+      upgrade.
+    - The -p switch for resize2fs is meant for an offline resize operation which
+      is done completely at the userspace. Changed the documentation to suggest
+      an "offline" operation.
+
+ -- Lorenzo De Liso <[e-mail]>  Thu, 25 Nov 2010 15:38:54 +0100
+
+e2fsprogs (1.41.12-2) unstable; urgency=high
+
+  * Allow tune2fs to set uninit_bg without requiring an fsck
+  * Fix test in e2fsck to correctly check for EOFBLOCKS files
+  * Fix dependencies for libuuid and libblkid (Closes: #583551)
+
+ -- Theodore Y. Ts'o <[e-mail]>  Thu, 03 Jun 2010 09:30:36 -0400
+
 e2fsprogs (1.41.12-1ubuntu3) natty; urgency=low
 
   * No-change upload to reduce changelogs.
 
=== modified file 'debian/control'
--- debian/control	2010-03-22 17:48:20 +0000
+++ debian/control	2010-12-13 17:21:59 +0000
@@ -1,12 +1,11 @@
 Source: e2fsprogs
 Section: admin
 Priority: required
-Maintainer: Ubuntu Core Developers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Theodore Y. Ts'o <[e-mail]>
 Build-Depends: texi2html (>= 1.76), gettext, texinfo, dc, pkg-config, debhelper (>= 7.0), m4, libblkid-dev (>= 2.16), uuid-dev (>= 2.16)
 Standards-Version: 3.8.4
 Homepage: http://e2fsprogs.sourceforge.net
-Vcs-Git: git://kernel.ubuntu.com/git/e2fsprogs.git
 
 Package: e2fsck-static
 Priority: optional
 
=== modified file 'debian/control.in'
--- debian/control.in	2010-03-22 17:48:20 +0000
+++ debian/control.in	2010-12-13 17:21:59 +0000
@@ -1,7 +1,7 @@
 Source: e2fsprogs
 Section: admin
 Priority: required
-Maintainer: Ubuntu Core Developers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Theodore Y. Ts'o <[e-mail]>
 ifdef(`UTIL_LINUX_NG',
 ``Build-Depends: texi2html (>= 1.76), gettext, texinfo, dc, pkg-config, debhelper (>= 7.0), m4, libblkid-dev (>= 2.16), uuid-dev (>= 2.16)
@@ -10,7 +10,6 @@
 '')dnl
 Standards-Version: 3.8.4
 Homepage: http://e2fsprogs.sourceforge.net
-Vcs-Git: git://kernel.ubuntu.com/git/e2fsprogs.git
 
 Package: e2fsck-static
 Priority: optional
 
=== modified file 'debian/e2fsprogs.shlibs.local'
--- debian/e2fsprogs.shlibs.local	2004-09-19 09:43:14 +0000
+++ debian/e2fsprogs.shlibs.local	2010-12-13 17:21:59 +0000
@@ -1,6 +1,4 @@
 libcom_err 2 libcomerr2 (>= 1.34-1)
 libss 2 libss2 (>= 1.34-1)
-libuuid 1 libuuid1 (>= 1.34-1)
 libext2fs 2 e2fslibs (= ${Source-Version})
 libe2p 2 e2fslibs (= ${Source-Version})
-libblkid 1 libblkid1 (>= 1.34-1)
 
=== modified file 'debian/rules'
--- debian/rules	2010-06-07 15:49:29 +0000
+++ debian/rules	2010-12-13 17:21:59 +0000
@@ -9,10 +9,15 @@
 
 # be paranoid
 export LC_ALL=C
+
+# Allow distro-specific behaviour
+DISTRO :=$(shell sed -ne '/DISTRIB_ID/s/.*=//p' /etc/lsb-release 2>/dev/null || echo Debian)
+SYS_BLKID_VER := $(shell dpkg-query -W libblkid1 | cut -f 2 | cut -b 1)
+ifeq ($(SYS_BLKID_VER),2)
+UTIL_LINUX_NG ?= yes
+endif
 # no chance that pkg-create-dbgsym can cope with this package's manual construction of -dbg
 export NO_PKG_MANGLE=1
-# always build with libblkid and libuuid from util-linux
-UTIL_LINUX_NG ?= yes
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
@@ -168,9 +173,17 @@
 M4_ARGS+=-UUTIL_LINUX_NG
 endif
 
+debian-files: debian/control debian/e2fsprogs.shlibs.local
+
+mrproper: clean
+	rm debian/control debian/e2fsprogs.shlibs.local
+
 debian/control: debian/control.in debian/rules
 	m4 $(M4_ARGS) < debian/control.in > $@
 
+debian/e2fsprogs.shlibs.local: debian/e2fsprogs.shlibs.local.in
+	m4 $(M4_ARGS) < debian/e2fsprogs.shlibs.local.in > $@
+
 ${CFGSTDSTAMP}:
 	dh_testdir
 
@@ -243,7 +256,7 @@
 	mkdir -p ${STAMPSDIR}
 	touch ${CFGSTATICSTAMP}
 
-build: debian/control build-std build-bf $(BUILD_STATIC)
+build: build-std build-bf $(BUILD_STATIC)
 
 build-std: ${BUILDSTDSTAMP}
 ${BUILDSTDSTAMP}: ${CFGSTDSTAMP}
@@ -283,7 +296,7 @@
 	$(MAKE) -C ${staticbuilddir}/e2fsck all e2fsck.static
 	touch ${BUILDSTATICSTAMP}
 
-clean: debian/control
+clean:
 	dh_testdir
 	rm -rf ${STAMPSDIR}
 	[ ! -f ${stdbuilddir}/Makefile ] || $(MAKE) -C ${stdbuilddir} distclean
@@ -322,7 +335,7 @@
 	ln -s et/com_err.h ${tmpdir}/usr/include
 
 	dh_movefiles
-	test -z `find ${tmpdir} -type f`
+	test -z "`find ${tmpdir} -type f`"
 
   # specially-built MIPS libs
 ifneq ($(ismips),)
@@ -455,8 +468,6 @@
 		-pe2fsprogs-dbg -pe2fslibs-dbg \
 		-plibcomerr2-dbg -plibss2-dbg
 ifneq ($(UTIL_LINUX_NG),yes)
-	DH_OPTIONS= dh_installchangelogs -plibblkid${BLKID_SOVERSION} \
-		-plibblkid1-dbg
 	DH_OPTIONS= dh_installchangelogs -plibuuid${UUID_SOVERSION} \
 		-puuid-dev -puuid-runtime -puuid-runtime-dbg -plibuuid1-dbg \
 		-plibblkid${BLKID_SOVERSION} -plibblkid1-dbg
@@ -602,4 +613,4 @@
 
 binary: binary-indep binary-arch
 
-.PHONY: binary binary-arch binary-indep clean checkroot
+.PHONY: binary binary-arch binary-indep clean checkroot mrproper debian-files
 
=== removed file 'e2fsck/Makefile.pq'
--- e2fsck/Makefile.pq	2009-04-29 18:19:46 +0000
+++ e2fsck/Makefile.pq	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-TOPSRC=..
-LIBNAME=E2FSCK.LIB
-OBJFILE=E2FSCK.LST
-
-OBJS= e2fsck.obj super.obj pass1.obj pass2.obj pass3.obj \
-	pass4.obj pass5.obj dirinfo.obj
-
-!include $(TOPSRC)\powerquest\MCONFIG
-
 
=== modified file 'e2fsck/pass1.c'
--- e2fsck/pass1.c	2010-06-07 15:49:29 +0000
+++ e2fsck/pass1.c	2010-12-13 17:21:59 +0000
@@ -2013,7 +2013,7 @@
 		 * doesn't need to be.
 		 */
 		if ((inode->i_flags & EXT4_EOFBLOCKS_FL) &&
-		    (size <= (((__u64)pb.last_block + 1) * fs->blocksize))) {
+		    (size >= (((__u64)pb.last_block + 1) * fs->blocksize))) {
 			pctx->blkcount = pb.last_block;
 			if (fix_problem(ctx, PR_1_EOFBLOCKS_FL_SET, pctx)) {
 				inode->i_flags &= ~EXT4_EOFBLOCKS_FL;
 
=== removed file 'lib/ext2fs/Makefile.pq'
--- lib/ext2fs/Makefile.pq	2009-04-29 18:19:46 +0000
+++ lib/ext2fs/Makefile.pq	1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-TOPSRC=..\..
-LIBNAME=EXT2.LIB
-OBJFILE=EXT2.LST
-
-OBJS= 	alloc.obj \
-	alloc_tables.obj \
-	badblocks.obj \
-	bb_compat.obj \
-	bb_inode.obj \
-	bitmaps.obj \
-	bitops.obj \
-	block.obj \
-	bmap.obj \
-	bmove.obj \
-	check_desc.obj \
-	closefs.obj \
-	cmp_bitmaps.obj \
-	dblist.obj \
-	dblist_dir.obj \
-	dirblock.obj \
-	dir_iterate.obj \
-	dupfs.obj \
-	expanddir.obj \
-	fileio.obj \
-	freefs.obj \
-	get_pathname.obj \
-	icount.obj \
-	initialize.obj \
-	inline.obj \
-	inode.obj \
-	ismounted.obj \
-	link.obj \
-	lookup.obj \
-	mkdir.obj \
-	namei.obj \
-	native.obj \
-	newdir.obj \
-	openfs.obj \
-	read_bb.obj \
-	read_bb_file.obj \
-	rs_bitmap.obj \
-	rw_bitmaps.obj \
-	swapfs.obj \
-	unlink.obj \
-	valid_blk.obj \
-	version.obj
-
-!include $(TOPSRC)\powerquest\MCONFIG
-
 
=== modified file 'lib/ext2fs/ext2_fs.h'
--- lib/ext2fs/ext2_fs.h	2010-03-22 17:48:20 +0000
+++ lib/ext2fs/ext2_fs.h	2010-12-13 17:21:59 +0000
@@ -50,6 +50,7 @@
 #define EXT2_UNDEL_DIR_INO	 6	/* Undelete directory inode */
 #define EXT2_RESIZE_INO		 7	/* Reserved group descriptors inode */
 #define EXT2_JOURNAL_INO	 8	/* Journal inode */
+#define EXT2_EXCLUDE_INO	 9	/* The "exclude" inode, for snapshots */
 
 /* First non-reserved inode for old ext2 filesystems */
 #define EXT2_GOOD_OLD_FIRST_INO	11
@@ -273,7 +274,11 @@
 #define EXT2_TOPDIR_FL			0x00020000 /* Top of directory hierarchies*/
 #define EXT4_HUGE_FILE_FL               0x00040000 /* Set to each huge file */
 #define EXT4_EXTENTS_FL 		0x00080000 /* Inode uses extents */
+#define EXT4_EA_INODE_FL	        0x00200000 /* Inode used for large EA */
 #define EXT4_EOFBLOCKS_FL		0x00400000 /* Blocks allocated beyond EOF */
+#define EXT4_SNAPFILE_FL		0x01000000  /* Inode is a snapshot */
+#define EXT4_SNAPFILE_DELETED_FL	0x04000000  /* Snapshot is being deleted */
+#define EXT4_SNAPFILE_SHRUNK_FL		0x08000000  /* Snapshot shrink has completed */
 #define EXT2_RESERVED_FL		0x80000000 /* reserved for ext2 lib */
 
 #define EXT2_FL_USER_VISIBLE		0x004BDFFF /* User visible flags */
@@ -462,6 +467,9 @@
 #define EXT2_FLAGS_SIGNED_HASH		0x0001  /* Signed dirhash in use */
 #define EXT2_FLAGS_UNSIGNED_HASH	0x0002  /* Unsigned dirhash in use */
 #define EXT2_FLAGS_TEST_FILESYS		0x0004	/* OK for use on development code */
+#define EXT2_FLAGS_IS_SNAPSHOT		0x0010	/* This is a snapshot image */
+#define EXT2_FLAGS_FIX_SNAPSHOT		0x0020	/* Snapshot inodes corrupted */
+#define EXT2_FLAGS_FIX_EXCLUDE		0x0040	/* Exclude bitmaps corrupted */
 
 /*
  * Mount flags
@@ -581,7 +589,12 @@
 	__u8    s_reserved_char_pad;
 	__u16	s_reserved_pad;		/* Padding to next 32bits */
 	__u64	s_kbytes_written;	/* nr of lifetime kilobytes written */
-	__u32   s_reserved[160];        /* Padding to the end of the block */
+	__u32	s_snapshot_inum;	/* Inode number of active snapshot */
+	__u32	s_snapshot_id;		/* sequential ID of active snapshot */
+	__u64	s_snapshot_r_blocks_count; /* reserved blocks for active
+					      snapshot's future use */
+	__u32	s_snapshot_list;	/* inode number of the head of the on-disk snapshot list */
+	__u32   s_reserved[155];        /* Padding to the end of the block */
 };
 
 /*
@@ -627,6 +640,7 @@
 #define EXT2_FEATURE_COMPAT_RESIZE_INODE	0x0010
 #define EXT2_FEATURE_COMPAT_DIR_INDEX		0x0020
 #define EXT2_FEATURE_COMPAT_LAZY_BG		0x0040
+#define EXT2_FEATURE_COMPAT_EXCLUDE_INODE	0x0080
 
 #define EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER	0x0001
 #define EXT2_FEATURE_RO_COMPAT_LARGE_FILE	0x0002
@@ -635,6 +649,7 @@
 #define EXT4_FEATURE_RO_COMPAT_GDT_CSUM		0x0010
 #define EXT4_FEATURE_RO_COMPAT_DIR_NLINK	0x0020
 #define EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE	0x0040
+#define EXT4_FEATURE_RO_COMPAT_HAS_SNAPSHOT	0x0080
 
 #define EXT2_FEATURE_INCOMPAT_COMPRESSION	0x0001
 #define EXT2_FEATURE_INCOMPAT_FILETYPE		0x0002
@@ -645,6 +660,8 @@
 #define EXT4_FEATURE_INCOMPAT_64BIT		0x0080
 #define EXT4_FEATURE_INCOMPAT_MMP		0x0100
 #define EXT4_FEATURE_INCOMPAT_FLEX_BG		0x0200
+#define EXT4_FEATURE_INCOMPAT_EA_INODE		0x0400
+#define EXT4_FEATURE_INCOMPAT_DIRDATA		0x1000
 
 
 #define EXT2_FEATURE_COMPAT_SUPP	0
 
=== modified file 'lib/ext2fs/fiemap.h'
--- lib/ext2fs/fiemap.h	2009-07-11 17:26:16 +0000
+++ lib/ext2fs/fiemap.h	2010-12-13 17:21:59 +0000
@@ -11,8 +11,6 @@
 #ifndef _LINUX_FIEMAP_H
 #define _LINUX_FIEMAP_H
 
-#include <linux/types.h>
-
 struct fiemap_extent {
 	__u64 fe_logical;  /* logical offset in bytes for the start of
 			    * the extent from the beginning of the file */
 
=== modified file 'misc/tune2fs.c'
--- misc/tune2fs.c	2009-08-25 18:34:46 +0000
+++ misc/tune2fs.c	2010-12-13 17:21:59 +0000
@@ -326,14 +326,28 @@
 	ext2fs_mark_super_dirty(fs);
 }
 
+static void request_fsck_afterwards(ext2_filsys fs)
+{
+	static int requested = 0;
+
+	if (requested++)
+		return;
+	fs->super->s_state &= ~EXT2_VALID_FS;
+	printf("\n%s\n", _(please_fsck));
+	if (mount_flags & EXT2_MF_READONLY)
+		printf(_("(and reboot afterwards!)\n"));
+}
+
 /*
  * Update the feature set as provided by the user.
  */
 static void update_feature_set(ext2_filsys fs, char *features)
 {
 	struct ext2_super_block *sb = fs->super;
+	struct ext2_group_desc *gd;
+	errcode_t	retval;
 	__u32		old_features[3];
-	int		type_err;
+	int		i, type_err;
 	unsigned int	mask_err;
 
 #define FEATURE_ON(type, mask) (!(old_features[(type)] & (mask)) && \
@@ -430,6 +444,36 @@
 		}
 	}
 
+	if (FEATURE_ON(E2P_FEATURE_RO_INCOMPAT,
+		       EXT4_FEATURE_RO_COMPAT_GDT_CSUM)) {
+		gd = fs->group_desc;
+		for (i = 0; i < fs->group_desc_count; i++, gd++) {
+			gd->bg_itable_unused = 0;
+			gd->bg_flags = EXT2_BG_INODE_ZEROED;
+			ext2fs_group_desc_csum_set(fs, i);
+		}
+		fs->flags &= ~EXT2_FLAG_SUPER_ONLY;
+	}
+
+	if (FEATURE_OFF(E2P_FEATURE_RO_INCOMPAT,
+			EXT4_FEATURE_RO_COMPAT_GDT_CSUM)) {
+		gd = fs->group_desc;
+		for (i = 0; i < fs->group_desc_count; i++, gd++) {
+			if ((gd->bg_flags & EXT2_BG_INODE_ZEROED) == 0) {
+				/* 
+				 * XXX what we really should do is zap
+				 * uninitialized inode tables instead.
+				 */
+				request_fsck_afterwards(fs);
+				break;
+			}
+			gd->bg_itable_unused = 0;
+			gd->bg_flags = 0;
+			gd->bg_checksum = 0;
+		}
+		fs->flags &= ~EXT2_FLAG_SUPER_ONLY;
+	}
+
 	if (sb->s_rev_level == EXT2_GOOD_OLD_REV &&
 	    (sb->s_feature_compat || sb->s_feature_ro_compat ||
 	     sb->s_feature_incompat))
@@ -437,8 +481,6 @@
 
 	if (FEATURE_CHANGED(E2P_FEATURE_RO_INCOMPAT,
 			    EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER) ||
-	    FEATURE_CHANGED(E2P_FEATURE_RO_INCOMPAT,
-			    EXT4_FEATURE_RO_COMPAT_GDT_CSUM) ||
 	    FEATURE_OFF(E2P_FEATURE_RO_INCOMPAT,
 			EXT4_FEATURE_RO_COMPAT_HUGE_FILE) ||
 	    FEATURE_CHANGED(E2P_FEATURE_INCOMPAT,
@@ -446,12 +488,8 @@
 	    FEATURE_CHANGED(E2P_FEATURE_COMPAT,
 			    EXT2_FEATURE_COMPAT_RESIZE_INODE) ||
 	    FEATURE_OFF(E2P_FEATURE_RO_INCOMPAT,
-			EXT2_FEATURE_RO_COMPAT_LARGE_FILE)) {
-		sb->s_state &= ~EXT2_VALID_FS;
-		printf("\n%s\n", _(please_fsck));
-		if (mount_flags & EXT2_MF_READONLY)
-			printf(_("(and reboot afterwards!)\n"));
-	}
+			EXT2_FEATURE_RO_COMPAT_LARGE_FILE))
+		request_fsck_afterwards(fs);
 
 	if ((old_features[E2P_FEATURE_COMPAT] != sb->s_feature_compat) ||
 	    (old_features[E2P_FEATURE_INCOMPAT] != sb->s_feature_incompat) ||
 
=== removed file 'resize/Makefile.pq'
--- resize/Makefile.pq	2009-04-29 18:19:46 +0000
+++ resize/Makefile.pq	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-TOPSRC=..
-LIBNAME=RESIZE.LIB
-OBJFILE=RESIZE.LST
-
-OBJS= extent.obj \
-	ext2_block_move.obj \
-	ext2_inode_move.obj \
-	resize2fs.obj
-
-!include $(TOPSRC)\powerquest\MCONFIG
-
 
=== removed file 'util/Makefile.pq'
--- util/Makefile.pq	2009-04-29 18:19:46 +0000
+++ util/Makefile.pq	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-TOPSRC=..
-
-!include $(TOPSRC)\powerquest\MCONFIG
-
-ALL:: libecho.exe
-
-libecho.exe: libecho.c
-
-clean:: 
-	$(RM) libecho.exe