From 906e1f18661b8901183a0061c50fb2f1b67e1eb1 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Mon, 3 Apr 2000 13:48:52 +0000 Subject: [PATCH] .del-ext2_fs.h~7a460879, ChangeLog: ext2_fs.h (EXT2_NOCOMPR_FL): Rename EXT2_NOCOMP_FL to EXT2_NOCOMPR_FL. ChangeLog, Makefile.in, pf.c: pf.c (print_flags): Rename EXT2_NOCOMP_FL to EXT2_NOCOMPR_FL. Makefile.in: Add "set -e" so that any errors in installing header files causes an immediate exit. --- include/linux/ChangeLog | 5 +++++ include/linux/ext2_fs.h | 2 +- lib/e2p/ChangeLog | 7 +++++++ lib/e2p/Makefile.in | 2 +- lib/e2p/pf.c | 2 +- 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/include/linux/ChangeLog b/include/linux/ChangeLog index 70a266f..8534015 100644 --- a/include/linux/ChangeLog +++ b/include/linux/ChangeLog @@ -1,3 +1,8 @@ +2000-04-03 Theodore Ts'o + + * ext2_fs.h (EXT2_NOCOMPR_FL): Rename EXT2_NOCOMP_FL to + EXT2_NOCOMPR_FL. + 2000-02-06 Theodore Ts'o * ext2_fs.h: Fix header to skip defining EXT2FS_DEBUG since blows diff --git a/include/linux/ext2_fs.h b/include/linux/ext2_fs.h index 72d9382..aa0f188 100644 --- a/include/linux/ext2_fs.h +++ b/include/linux/ext2_fs.h @@ -181,7 +181,7 @@ struct ext2_group_desc /* Reserved for compression usage... */ #define EXT2_DIRTY_FL 0x00000100 #define EXT2_COMPRBLK_FL 0x00000200 /* One or more compressed clusters */ -#define EXT2_NOCOMP_FL 0x00000400 /* Don't compress */ +#define EXT2_NOCOMPR_FL 0x00000400 /* Access raw compressed data */ #define EXT2_ECOMPR_FL 0x00000800 /* Compression error */ /* End compression flags --- maybe not all used */ #define EXT2_BTREE_FL 0x00001000 /* btree format dir */ diff --git a/lib/e2p/ChangeLog b/lib/e2p/ChangeLog index ac3c6a4..e69cc20 100644 --- a/lib/e2p/ChangeLog +++ b/lib/e2p/ChangeLog @@ -1,3 +1,10 @@ +2000-04-03 Theodore Ts'o + + * pf.c (print_flags): Rename EXT2_NOCOMP_FL to EXT2_NOCOMPR_FL. + + * Makefile.in: Add "set -e" so that any errors in installing + header files causes an immediate exit. + 2000-02-10 Theodore Ts'o * Makefile.in: Install the e2p.h header. diff --git a/lib/e2p/Makefile.in b/lib/e2p/Makefile.in index c33b1ba..e852e5d 100644 --- a/lib/e2p/Makefile.in +++ b/lib/e2p/Makefile.in @@ -79,7 +79,7 @@ install:: all installdirs $(CHMOD) 644 $(DESTDIR)$(libdir)/libe2p.a -$(RANLIB) $(DESTDIR)$(libdir)/libe2p.a $(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libe2p.a - for i in $(HFILES); do \ + set -e; for i in $(HFILES); do \ $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir)/e2p/$$i; \ done diff --git a/lib/e2p/pf.c b/lib/e2p/pf.c index 91bd59e..c109ac2 100644 --- a/lib/e2p/pf.c +++ b/lib/e2p/pf.c @@ -35,7 +35,7 @@ static struct flags_name flags_array[] = { { EXT2_COMPR_FL, "c", "Compression_requested" }, { EXT2_COMPRBLK_FL, "B", "Compressed_file" }, { EXT2_DIRTY_FL, "D", "Compressed dirty file" }, - { EXT2_NOCOMP_FL, "X", "Raw_access" }, + { EXT2_NOCOMPR_FL, "X", "Raw_access" }, { EXT2_ECOMPR_FL, "E", "Compression_Error" }, { 0, NULL, NULL } }; -- 1.8.3.1