Merge branch 'maint' into next

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

diff --git a/debugfs/set_fields.c b/debugfs/set_fields.c
index f497bd9..b001579 100644 (file)
--- a/debugfs/set_fields.c
+++ b/debugfs/set_fields.c
@@ -487,10 +487,7 @@ static errcode_t parse_uint(struct field_set_info *info, char *field,
        n = num & mask;
        switch (size) {
        case 8:
-               /* Should never get here */
-               fprintf(stderr, "64-bit field %s has a second 64-bit field\n"
-                       "defined; BUG?!?\n", info->name);
-               *u.ptr64 = 0;
+               *u.ptr64 = n;
                break;
        case 4:
                *u.ptr32 = n;
@@ -510,7 +507,10 @@ static errcode_t parse_uint(struct field_set_info *info, char *field,
                size = 2;
        switch (size) {
        case 8:
-               *u.ptr64 = n;
+               /* Should never get here */
+               fprintf(stderr, "64-bit field %s has a second 64-bit field\n"
+                       "defined; BUG?!?\n", info->name);
+               *u.ptr64 = 0;
                break;
        case 4:
                *u.ptr32 = n;