From: Theodore Ts'o Date: Tue, 26 Oct 1999 02:06:39 +0000 (+0000) Subject: .del-ext2_fs.h~7a460879, ChangeLog: X-Git-Tag: E2FSPROGS-1_17~17 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=601002bd2a144da02165529743a4b1621cfe9ae3;p=tools%2Fe2fsprogs.git .del-ext2_fs.h~7a460879, ChangeLog: ext2_fs.h (i_reserved2): Use __GNU__ instead of __hurd__ to detect the Hurd OS. To protect against future irrationality on the part of the FSF concerning whether Linux is GNU or not, on a system which defines both __linux__ and __GNU___, __linux__ takes precedence. ChangeLog, initialize.c: initialize.c (CREATOR_OS): Use __GNU__ instead of __gnu__ to detect the Hurd OS. ChangeLog, debugfs.c: debugfs.c (do_dirty_filesys): Make the "dirty" command clear the valid bit on the superblock. (And with a -clean option to set the valid bit.) Originally it was used just to set the "needs to be written" bit in the in-core version of the fs structure. --- diff --git a/debugfs/ChangeLog b/debugfs/ChangeLog index 0123cb9..8db0d63 100644 --- a/debugfs/ChangeLog +++ b/debugfs/ChangeLog @@ -1,3 +1,11 @@ +1999-10-25 + + * debugfs.c (do_dirty_filesys): Make the "dirty" command clear the + valid bit on the superblock. (And with a -clean option to + set the valid bit.) Originally it was used just to set + the "needs to be written" bit in the in-core version of + the fs structure. + 1999-10-22 * Release of E2fsprogs 1.16 diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c index 49738ca..3b3ce55 100644 --- a/debugfs/debugfs.c +++ b/debugfs/debugfs.c @@ -300,7 +300,13 @@ void do_dirty_filesys(int argc, char **argv) { if (check_fs_open(argv[0])) return; - + if (check_fs_read_write(argv[0])) + return; + + if (argv[1] && !strcmp(argv[1], "-clean")) + current_fs->super->s_state |= EXT2_VALID_FS; + else + current_fs->super->s_state &= ~EXT2_VALID_FS; ext2fs_mark_super_dirty(current_fs); } diff --git a/include/linux/ChangeLog b/include/linux/ChangeLog index daee954..bd8148d 100644 --- a/include/linux/ChangeLog +++ b/include/linux/ChangeLog @@ -1,3 +1,11 @@ +1999-10-25 + + * ext2_fs.h (i_reserved2): Use __GNU__ instead of __hurd__ to + detect the Hurd OS. To protect against future + irrationality on the part of the FSF concerning whether + Linux is GNU or not, on a system which defines both + __linux__ and __GNU___, __linux__ takes precedence. + 1999-10-22 * Release of E2fsprogs 1.16 diff --git a/include/linux/ext2_fs.h b/include/linux/ext2_fs.h index a2c1a95..75dd714 100644 --- a/include/linux/ext2_fs.h +++ b/include/linux/ext2_fs.h @@ -275,23 +275,21 @@ struct ext2_inode { #define i_frag osd2.linux2.l_i_frag #define i_fsize osd2.linux2.l_i_fsize #define i_reserved2 osd2.linux2.l_i_reserved2 -#endif -#ifdef __hurd__ +#elif defined(__GNU__) #define i_translator osd1.hurd1.h_i_translator #define i_frag osd2.hurd2.h_i_frag; #define i_fsize osd2.hurd2.h_i_fsize; #define i_uid_high osd2.hurd2.h_i_uid_high #define i_gid_high osd2.hurd2.h_i_gid_high #define i_author osd2.hurd2.h_i_author -#endif -#ifdef __masix__ +#elif defined (__masix__) #define i_reserved1 osd1.masix1.m_i_reserved1 #define i_frag osd2.masix2.m_i_frag #define i_fsize osd2.masix2.m_i_fsize #define i_reserved2 osd2.masix2.m_i_reserved2 -#endif +#endif /* defined(__KERNEL__) || defined(__linux__) */ /* * File system states diff --git a/lib/ext2fs/ChangeLog b/lib/ext2fs/ChangeLog index 43bbc8c..2fe483b 100644 --- a/lib/ext2fs/ChangeLog +++ b/lib/ext2fs/ChangeLog @@ -1,3 +1,8 @@ +1999-10-25 + + * initialize.c (CREATOR_OS): Use __GNU__ instead of __gnu__ to + detect the Hurd OS. + 1999-10-22 * Release of E2fsprogs 1.16 diff --git a/lib/ext2fs/initialize.c b/lib/ext2fs/initialize.c index d04a7f5..228c318 100644 --- a/lib/ext2fs/initialize.c +++ b/lib/ext2fs/initialize.c @@ -34,7 +34,7 @@ #if defined(__linux__) && defined(EXT2_OS_LINUX) #define CREATOR_OS EXT2_OS_LINUX -#elif defined(__gnu__) && defined(EXT2_OS_HURD) +#elif defined(__GNU__) && defined(EXT2_OS_HURD) #define CREATOR_OS EXT2_OS_HURD #elif defined(__FreeBSD__) && defined(EXT2_OS_FREEBSD) #define CREATOR_OS EXT2_OS_FREEBSD