Update for 1.27 release.

[tools/e2fsprogs.git] / debugfs / logdump.c

diff --git a/debugfs/logdump.c b/debugfs/logdump.c
index 0102c24..c7a5ca9 100644 (file)
--- a/debugfs/logdump.c
+++ b/debugfs/logdump.c
@@ -34,6 +34,7 @@ extern int optreset;          /* defined by BSD, but not others */
 
 #include "debugfs.h"
 #include "jfs_user.h"
+#include <uuid/uuid.h>
 
 enum journal_location {JOURNAL_IS_INTERNAL, JOURNAL_IS_EXTERNAL};
 
@@ -202,13 +203,8 @@ void do_logdump(int argc, char **argv)
                journal_source.where = JOURNAL_IS_EXTERNAL;
                journal_source.fd = journal_fd;
        } else if ((journal_inum = current_fs->super->s_journal_inum)) {
-               retval = ext2fs_read_inode(current_fs, journal_inum, 
-                                          &journal_inode);
-               if (retval) {
-                       com_err(argv[0], retval,
-                               "while reading inode %u", journal_inum);
+               if (debugfs_read_inode(journal_inum, &journal_inode, argv[0]))
                        return;
-               }
 
                retval = ext2fs_file_open(current_fs, journal_inum,
                                          0, &journal_file);
@@ -342,13 +338,13 @@ static void dump_journal(char *cmdname, FILE *out_file,
            (sb->s_feature_incompat & EXT3_FEATURE_INCOMPAT_JOURNAL_DEV)) {
                blocksize = EXT2_BLOCK_SIZE(sb);
                blocknr = (blocksize == 1024) ? 2 : 1;
-               uuid_unparse(&sb->s_uuid, jsb_buffer);
+               uuid_unparse(sb->s_uuid, jsb_buffer);
                fprintf(out_file, "Ext2 superblock header found.\n");
                if (dump_all) {
                        fprintf(out_file, "\tuuid=%s\n", jsb_buffer);
                        fprintf(out_file, "\tblocksize=%d\n", blocksize);
                        fprintf(out_file, "\tjournal data size %ld\n",
-                               sb->s_blocks_count);
+                               (long) sb->s_blocks_count);
                }
        }