ChangeLog, Makefile.in:

  Makefile.in (uuid_time): Fix compilation rule so that uuid_time.o
  	doesn't get bashed in order to build the command-line version of
  	uuid_time.
.del-ext2_fs.h~7a460879, ChangeLog:
  ext2_fs.h: Update ext3 extension feature #define's.

diff --git a/include/linux/ChangeLog b/include/linux/ChangeLog
index 80de664c7c9cb3564abd961d1294f9ac32b47285..5c3e2f95f15f3a4baf631f348b5e5312c88b6815 100644 (file)
--- a/include/linux/ChangeLog
+++ b/include/linux/ChangeLog
@@ -1,3 +1,7 @@
+2000-07-07  Theodore Ts'o  <tytso@valinux.com>
+
+       * ext2_fs.h: Update ext3 extension feature #define's.
+
 2000-07-04  Theodore Ts'o  <tytso@valinux.com>
 
        * ext2_fs.h: Update to include latest journalling additions to the

diff --git a/include/linux/ext2_fs.h b/include/linux/ext2_fs.h
index 9f89ca183bf3abaf5853dfda7df37beaf44b3bde..2f8fcfbcce3a4ec95732345a7357178df41bf99a 100644 (file)
--- a/include/linux/ext2_fs.h
+++ b/include/linux/ext2_fs.h
@@ -185,6 +185,7 @@ struct ext2_group_desc
 #define EXT2_ECOMPR_FL                 0x00000800 /* Compression error */
 /* End compression flags --- maybe not all used */     
 #define EXT2_BTREE_FL                  0x00001000 /* btree format dir */
+#define EXT2_IMAGIC_FL                 0x00002000
 #define EXT2_RESERVED_FL               0x80000000 /* reserved for ext2 lib */
 
 #define EXT2_FL_USER_VISIBLE           0x00001FFF /* User visible flags */
@@ -432,6 +433,8 @@ struct ext2_super_block {
        ( EXT2_SB(sb)->s_feature_incompat & (mask) )
 
 #define EXT2_FEATURE_COMPAT_DIR_PREALLOC       0x0001
+#define EXT2_FEATURE_COMPAT_IMAGIC_INODES      0x0002
+#define EXT3_FEATURE_COMPAT_HAS_JOURNAL                0x0004
 
 #define EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER    0x0001
 #define EXT2_FEATURE_RO_COMPAT_LARGE_FILE      0x0002
@@ -439,6 +442,7 @@ struct ext2_super_block {
 
 #define EXT2_FEATURE_INCOMPAT_COMPRESSION      0x0001
 #define EXT2_FEATURE_INCOMPAT_FILETYPE         0x0002
+#define EXT3_FEATURE_INCOMPAT_RECOVER          0x0004 /* Needs recovery */
 
 #define EXT2_FEATURE_COMPAT_SUPP       0
 #define EXT2_FEATURE_INCOMPAT_SUPP     EXT2_FEATURE_INCOMPAT_FILETYPE

diff --git a/lib/uuid/ChangeLog b/lib/uuid/ChangeLog
index 84248f815f5adf31e21146cecbcedab8720018d3..f0e14508b686f3ef24e808dd91455383d3c21e0b 100644 (file)
--- a/lib/uuid/ChangeLog
+++ b/lib/uuid/ChangeLog
@@ -1,3 +1,9 @@
+2000-07-07  Theodore Ts'o  <tytso@valinux.com>
+
+       * Makefile.in (uuid_time): Fix compilation rule so that
+               uuid_time.o doesn't get bashed in order to build the
+               command-line version of uuid_time.
+
 2000-07-04  Theodore Ts'o  <tytso@valinux.com>
 
        * Makefile.in: Remove explicit link of -lc in the shared library.

diff --git a/lib/uuid/Makefile.in b/lib/uuid/Makefile.in
index 2b0addb1caa9fb3103f0d3199dbce5c253469fa3..cbf733dc13594d5ad0d3c4f59ec305ffb9bb0a79 100644 (file)
--- a/lib/uuid/Makefile.in
+++ b/lib/uuid/Makefile.in
@@ -91,9 +91,8 @@ tst_uuid: tst_uuid.o $(DEPLIBUUID)
        $(CC) $(ALL_LDFLAGS) -o tst_uuid tst_uuid.o $(LIBUUID)
 
 uuid_time: $(srcdir)/uuid_time.c $(DEPLIBUUID)
-       $(CC) $(ALL_CFLAGS) -DDEBUG $(srcdir)/uuid_time.c -c -o uuid_time.o
-       $(CC) -o uuid_time uuid_time.o $(LIBUUID)
-       $(RM) uuid_time.o
+       $(CC) $(ALL_CFLAGS) -DDEBUG -o uuid_time $(srcdir)/uuid_time.c \
+               $(LIBUUID)
 
 libuuid.3: $(DEP_SUBSTITUTE) $(srcdir)/libuuid.3.in
        $(SUBSTITUTE) $(srcdir)/libuuid.3.in libuuid.3