From ec4785766ea9c8abfb01d3a48788c1e62f2620aa Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Fri, 7 Jul 2000 04:31:55 +0000 Subject: [PATCH] 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. --- include/linux/ChangeLog | 4 ++++ include/linux/ext2_fs.h | 4 ++++ lib/uuid/ChangeLog | 6 ++++++ lib/uuid/Makefile.in | 5 ++--- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/include/linux/ChangeLog b/include/linux/ChangeLog index 80de664..5c3e2f9 100644 --- a/include/linux/ChangeLog +++ b/include/linux/ChangeLog @@ -1,3 +1,7 @@ +2000-07-07 Theodore Ts'o + + * ext2_fs.h: Update ext3 extension feature #define's. + 2000-07-04 Theodore Ts'o * 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 9f89ca1..2f8fcfb 100644 --- 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 84248f8..f0e1450 100644 --- a/lib/uuid/ChangeLog +++ b/lib/uuid/ChangeLog @@ -1,3 +1,9 @@ +2000-07-07 Theodore Ts'o + + * 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 * Makefile.in: Remove explicit link of -lc in the shared library. diff --git a/lib/uuid/Makefile.in b/lib/uuid/Makefile.in index 2b0addb..cbf733d 100644 --- 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 -- 1.8.3.1