btrfs-progs: extent_io: Init eb->lru to avoid NULL pointer dereference

[platform/upstream/btrfs-progs.git] / btrfs-sb-mod.c

diff --git a/btrfs-sb-mod.c b/btrfs-sb-mod.c
index 8f5bead..c381fb6 100644 (file)
--- a/btrfs-sb-mod.c
+++ b/btrfs-sb-mod.c
@@ -110,6 +110,7 @@ struct fspec {
 enum field_type {
        TYPE_UNKNOWN,
        TYPE_U64,
+       TYPE_U16,
 };
 
 struct sb_field {
@@ -123,21 +124,43 @@ struct sb_field {
        { .name = "chunk_root_generation", .type = TYPE_U64 },
        { .name = "cache_generation", .type = TYPE_U64 },
        { .name = "uuid_tree_generation", .type = TYPE_U64 },
+       { .name = "compat_flags", .type = TYPE_U64 },
+       { .name = "compat_ro_flags", .type = TYPE_U64 },
+       { .name = "incompat_flags", .type = TYPE_U64 },
+       { .name = "csum_type", .type = TYPE_U16 },
 };
 
-#define MOD_FIELD(fname, set, val)                                     \
+#define MOD_FIELD_XX(fname, set, val, bits, f_dec, f_hex, f_type)      \
        else if (strcmp(name, #fname) == 0) {                           \
                if (set) {                                              \
-                       printf("SET: %s %llu (0x%llx)\n", #fname,       \
-                       (unsigned long long)*val, (unsigned long long)*val);    \
-                       sb->fname = cpu_to_le64(*val);                  \
+                       printf("SET: "#fname" "f_dec" (0x"f_hex")\n", \
+                       (f_type)*val, (f_type)*val);                            \
+                       sb->fname = cpu_to_le##bits(*val);                      \
                } else {                                                        \
-                       *val = le64_to_cpu(sb->fname);                  \
-                       printf("GET: %s %llu (0x%llx)\n", #fname,       \
-                       (unsigned long long)*val, (unsigned long long)*val);    \
+                       *val = le##bits##_to_cpu(sb->fname);                    \
+                       printf("GET: "#fname" "f_dec" (0x"f_hex")\n",   \
+                       (f_type)*val, (f_type)*val);                    \
                }                                                       \
        }
 
+#define MOD_FIELD64(fname, set, val)                                   \
+       MOD_FIELD_XX(fname, set, val, 64, "%llu", "%llx", unsigned long long)
+
+/* Alias for u64 */
+#define MOD_FIELD(fname, set, val)     MOD_FIELD64(fname, set, val)
+
+/*
+ * Support only GET and SET properly, ADD and SUB may work
+ */
+#define MOD_FIELD32(fname, set, val)                                   \
+       MOD_FIELD_XX(fname, set, val, 32, "%u", "%x", unsigned int)
+
+#define MOD_FIELD16(fname, set, val)                                   \
+       MOD_FIELD_XX(fname, set, val, 16, "%hu", "%hx", unsigned short int)
+
+#define MOD_FIELD8(fname, set, val)                                    \
+       MOD_FIELD_XX(fname, set, val, 8, "%hhu", "%hhx", unsigned char)
+
 static void mod_field_by_name(struct btrfs_super_block *sb, int set, const char *name,
                u64 *val)
 {
@@ -149,6 +172,10 @@ static void mod_field_by_name(struct btrfs_super_block *sb, int set, const char
                MOD_FIELD(chunk_root_generation, set, val)
                MOD_FIELD(cache_generation, set, val)
                MOD_FIELD(uuid_tree_generation, set, val)
+               MOD_FIELD(compat_flags, set, val)
+               MOD_FIELD(compat_ro_flags, set, val)
+               MOD_FIELD(incompat_flags, set, val)
+               MOD_FIELD16(csum_type, set, val)
        else {
                printf("ERROR: unhandled field: %s\n", name);
                exit(1);