diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2019-11-08 17:17:35 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2019-11-09 01:55:14 -0500 |
| commit | 8335d3c57ec077d8fb6beeaed7c7bb1fe7bca17e (patch) | |
| tree | ba8df7a19c1b64733a3a2d65692927af7259ce54 /misc/dumpe2fs.c | |
| parent | db113c0e76826d621dfc5ee968ccbbe2127363a6 (diff) | |
| download | e2fsprogs-8335d3c57ec077d8fb6beeaed7c7bb1fe7bca17e.tar.gz | |
Rename functions, types, constants to reflect jbd2 usage
We had previously stuck to using the names from ext3/jbd kernel files,
and used a script in contrib/jbd2-resync.sh to convert the kernel
files to use the ext3/jbd conventions so we could keep the files
e2fsck/recovery.c and e2fsck/revoke.c in sync with jbd2/recovery.c and
jbd2/revoke.c, respectively.
This has been getting harder and harder, so let's make a global sweep
through e2fsprogs to use the jbd2 names. Fortunately none of the
ext3/jbd names had leaked out into publically exported header files,
so this is only an internal change. Which looks scary, but it's
basically a search and replace, so if it compiles it's going to be
correct.
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'misc/dumpe2fs.c')
| -rw-r--r-- | misc/dumpe2fs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/misc/dumpe2fs.c b/misc/dumpe2fs.c index 18148e2a..9a6f586e 100644 --- a/misc/dumpe2fs.c +++ b/misc/dumpe2fs.c @@ -387,7 +387,7 @@ static void print_inline_journal_information(ext2_filsys fs) } ext2fs_file_close(journal_file); jsb = (journal_superblock_t *) buf; - if (be32_to_cpu(jsb->s_header.h_magic) != JFS_MAGIC_NUMBER) { + if (be32_to_cpu(jsb->s_header.h_magic) != JBD2_MAGIC_NUMBER) { fprintf(stderr, "%s", _("Journal superblock magic number invalid!\n")); exit(1); @@ -410,9 +410,9 @@ static void print_journal_information(ext2_filsys fs) exit(1); } jsb = (journal_superblock_t *) buf; - if ((jsb->s_header.h_magic != (unsigned) ntohl(JFS_MAGIC_NUMBER)) || + if ((jsb->s_header.h_magic != (unsigned) ntohl(JBD2_MAGIC_NUMBER)) || (jsb->s_header.h_blocktype != - (unsigned) ntohl(JFS_SUPERBLOCK_V2))) { + (unsigned) ntohl(JBD2_SUPERBLOCK_V2))) { com_err(program_name, 0, "%s", _("Couldn't find journal superblock magic numbers")); exit(1); |