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 8297e08..365a8dc 100644 (file)
--- a/debugfs/set_fields.c
+++ b/debugfs/set_fields.c
@@ -153,6 +153,8 @@ static struct field_set_info super_fields[] = {
        { "backup_bgs", &set_sb.s_backup_bgs[0], NULL, 4, parse_uint,
          FLAG_ARRAY, 2 },
        { "checksum", &set_sb.s_checksum, NULL, 4, parse_uint },
+       { "checksum_type", &set_sb.s_checksum_type, NULL, 1, parse_uint },
+       { "encryption_level", &set_sb.s_encryption_level, NULL, 1, parse_uint },
        { "error_count", &set_sb.s_error_count, NULL, 4, parse_uint },
        { "first_error_time", &set_sb.s_first_error_time, NULL, 4, parse_time },
        { "first_error_ino", &set_sb.s_first_error_ino, NULL, 4, parse_uint },
@@ -164,6 +166,10 @@ static struct field_set_info super_fields[] = {
        { "last_error_block", &set_sb.s_last_error_block, NULL, 8, parse_uint },
        { "last_error_func", &set_sb.s_last_error_func, NULL, 32, parse_string },
        { "last_error_line", &set_sb.s_last_error_line, NULL, 4, parse_uint },
+       { "encrypt_algos", &set_sb.s_encrypt_algos, NULL, 1, parse_uint,
+         FLAG_ARRAY, 4 },
+       { "encrypt_pw_salt", &set_sb.s_encrypt_pw_salt, NULL, 16, parse_uuid },
+       { "lpf_ino", &set_sb.s_lpf_ino, NULL, 4, parse_uint },
        { 0, 0, 0, 0 }
 };
 
@@ -269,6 +275,7 @@ static struct field_set_info mmp_fields[] = {
        { "bdevname", &set_mmp.mmp_bdevname, NULL, sizeof(set_mmp.mmp_bdevname),
                parse_string },
        { "check_interval", &set_mmp.mmp_check_interval, NULL, 2, parse_uint },
+       { "checksum", &set_mmp.mmp_checksum, NULL, 4, parse_uint },
        { 0, 0, 0, 0 }
 };
 
@@ -839,6 +846,7 @@ static errcode_t parse_mmp_clear(struct field_set_info *info,
 
 void do_set_mmp_value(int argc, char *argv[])
 {
+#ifdef CONFIG_MMP
        const char *usage = "<field> <value>\n"
                "\t\"set_mmp_value -l\" will list the names of "
                "MMP fields\n\twhich can be set.";
@@ -893,5 +901,9 @@ void do_set_mmp_value(int argc, char *argv[])
                                 &set_mmp);
                *mmp_s = set_mmp;
        }
+#else
+       fprintf(stdout, "MMP is unsupported, please recompile with "
+                       "--enable-mmp\n");
+#endif
 }