LU-8465 e2fsck: set E2F_FLAG_ALLOC_OK after threads

[tools/e2fsprogs.git] / misc / e2image.c

diff --git a/misc/e2image.c b/misc/e2image.c
index 3c881fe..892c537 100644 (file)
--- a/misc/e2image.c
+++ b/misc/e2image.c
@@ -54,7 +54,7 @@ extern int optind;
 #include "support/plausible.h"
 #include "../version.h"
 
-#define QCOW_OFLAG_COPIED     (1LL << 63)
+#define QCOW_OFLAG_COPIED     (1ULL << 63)
 #define NO_BLK ((blk64_t) -1)
 
 /* Image types */
@@ -104,11 +104,11 @@ static int get_bits_from_size(size_t size)
 
 static void usage(void)
 {
-       fprintf(stderr, _("Usage: %s [ -r|Q ] [ -f ] [ -b superblock ] [ -B blocksize]"
-                         "[ -fr ] device image-file\n"),
+       fprintf(stderr, _("Usage: %s [ -r|-Q ] [ -f ] [ -b superblock ] [ -B blocksize ] "
+                         "device image-file\n"),
                program_name);
        fprintf(stderr, _("       %s -I device image-file\n"), program_name);
-       fprintf(stderr, _("       %s -ra  [  -cfnp  ] [ -o src_offset ] "
+       fprintf(stderr, _("       %s -ra [ -cfnp ] [ -o src_offset ] "
                          "[ -O dest_offset ] src_fs [ dest_fs ]\n"),
                program_name);
        exit (1);
@@ -312,7 +312,7 @@ struct process_block_struct {
  * structure, so there's no point in letting the ext2fs library read
  * the inode again.
  */
-static ino_t stashed_ino = 0;
+static ext2_ino_t stashed_ino = 0;
 static struct ext2_inode *stashed_inode;
 
 static errcode_t meta_get_blocks(ext2_filsys fs EXT2FS_ATTR((unused)),