glusterfs
glusterfs copied to clipboard
Update rfc.sh for release-9
/recheck smoke
need to remove el6 tests from release-9 branch.
/recheck smoke
/recheck smoke
$changed
/recheck clang-format
$FAILURE_COMMENT
/recheck clang-format
$FAILURE_COMMENT
!!! Couldn't read commit file !!!
/recheck clang-format
/recheck clang-format
CLANG-FORMAT FAILURE: Before merging the patch, this diff needs to be considered for passing clang-format
b'diff --git a/libglusterfs/src/common-utils.c b/libglusterfs/src/common-utils.c\nindex 9c684385f..9f9d731b7 100644\n--- a/libglusterfs/src/common-utils.c\n+++ b/libglusterfs/src/common-utils.c\n@@ -90,12 +90,12 @@ char *xattrs_to_heal[] = {"user.",\n GF_XATTR_MDATA_KEY,\n NULL};\n \n-void gf_assert(void)\n+void\n+gf_assert(void)\n {\n if (gf_signal_on_assert) {\n raise(SIGCONT);\n }\n-\n }\n \n void\ndiff --git a/libglusterfs/src/glusterfs/common-utils.h b/libglusterfs/src/glusterfs/common-utils.h\nindex c8014a127..6974c82f9 100644\n--- a/libglusterfs/src/glusterfs/common-utils.h\n+++ b/libglusterfs/src/glusterfs/common-utils.h\n@@ -444,7 +444,8 @@ BIT_VALUE(unsigned char *array, unsigned int index)\n } \\n } while (0)\n \n-void gf_assert(void);\n+void\n+gf_assert(void);\n \n #ifdef DEBUG\n #define GF_ASSERT(x) assert(x);\ndiff --git a/xlators/debug/io-stats/src/io-stats.c b/xlators/debug/io-stats/src/io-stats.c\nindex 0eac50117..a36336736 100644\n--- a/xlators/debug/io-stats/src/io-stats.c\n+++ b/xlators/debug/io-stats/src/io-stats.c\n@@ -3765,10 +3765,10 @@ reconfigure(xlator_t *this, dict_t *options)\n GF_OPTION_RECONF("ios-dump-format", dump_format_str, options, str, out);\n ios_set_log_format_code(conf, dump_format_str);\n if (conf->ios_sample_interval) {\n- GF_OPTION_RECONF("ios-sample-buf-size", conf->ios_sample_buf_size, options,\n- int32, out);\n+ GF_OPTION_RECONF("ios-sample-buf-size", conf->ios_sample_buf_size,\n+ options, int32, out);\n } else {\n- ios_sample_buf_size_configure (this->name, conf);\n+ ios_sample_buf_size_configure(this->name, conf);\n }\n \n GF_OPTION_RECONF("sys-log-level", sys_log_str, options, str, out);\n@@ -3951,7 +3951,7 @@ init(xlator_t *this)\n GF_OPTION_INIT("ios-sample-buf-size", conf->ios_sample_buf_size, int32,\n out);\n } else {\n- ios_sample_buf_size_configure (this->name, conf);\n+ ios_sample_buf_size_configure(this->name, conf);\n }\n \n ret = ios_init_sample_buf(conf);\ndiff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c\nindex 5652b7e69..a9f7353f7 100644\n--- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c\n+++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c\n@@ -1460,12 +1460,10 @@ struct volopt_map_entry glusterd_volopt_map[] = {\n .voltype = "performance/md-cache",\n .option = "pass-through",\n .op_version = GD_OP_VERSION_4_1_0},\n- {\n- .key = "performance.write-behind-pass-through",\n- .voltype = "performance/write-behind",\n- .option = "pass-through",\n- .op_version = GD_OP_VERSION_9_0\n- },\n+ {.key = "performance.write-behind-pass-through",\n+ .voltype = "performance/write-behind",\n+ .option = "pass-through",\n+ .op_version = GD_OP_VERSION_9_0},\n {.key = "performance.md-cache-timeout",\n .voltype = "performance/md-cache",\n .option = "md-cache-timeout",\ndiff --git a/xlators/performance/write-behind/src/write-behind.c b/xlators/performance/write-behind/src/write-behind.c\nindex c46ffb19e..243ed511c 100644\n--- a/xlators/performance/write-behind/src/write-behind.c\n+++ b/xlators/performance/write-behind/src/write-behind.c\n@@ -3191,15 +3191,13 @@ struct volume_options options[] = {\n .op_version = {GD_OP_VERSION_6_0},\n .flags = OPT_FLAG_SETTABLE,\n },\n- {\n- .key = {"pass-through"},\n- .type = GF_OPTION_TYPE_BOOL,\n- .default_value = "false",\n- .op_version = {GD_OP_VERSION_9_0},\n- .flags = OPT_FLAG_SETTABLE | OPT_FLAG_DOC | OPT_FLAG_CLIENT_OPT,\n- .tags = {"write-behind"},\n- .description = "Enable/disable write-behind pass-through"\n- },\n+ {.key = {"pass-through"},\n+ .type = GF_OPTION_TYPE_BOOL,\n+ .default_value = "false",\n+ .op_version = {GD_OP_VERSION_9_0},\n+ .flags = OPT_FLAG_SETTABLE | OPT_FLAG_DOC | OPT_FLAG_CLIENT_OPT,\n+ .tags = {"write-behind"},\n+ .description = "Enable/disable write-behind pass-through"},\n {.key = {"flush-behind"},\n .type = GF_OPTION_TYPE_BOOL,\n .default_value = "on",\n'
CLANG-FORMAT FAILURE: Before merging the patch, this diff needs to be considered for passing clang-format
b'diff --git a/libglusterfs/src/common-utils.c b/libglusterfs/src/common-utils.c\nindex 9c684385f..9f9d731b7 100644\n--- a/libglusterfs/src/common-utils.c\n+++ b/libglusterfs/src/common-utils.c\n@@ -90,12 +90,12 @@ char *xattrs_to_heal[] = {"user.",\n GF_XATTR_MDATA_KEY,\n NULL};\n \n-void gf_assert(void)\n+void\n+gf_assert(void)\n {\n if (gf_signal_on_assert) {\n raise(SIGCONT);\n }\n-\n }\n \n void\ndiff --git a/libglusterfs/src/glusterfs/common-utils.h b/libglusterfs/src/glusterfs/common-utils.h\nindex c8014a127..6974c82f9 100644\n--- a/libglusterfs/src/glusterfs/common-utils.h\n+++ b/libglusterfs/src/glusterfs/common-utils.h\n@@ -444,7 +444,8 @@ BIT_VALUE(unsigned char *array, unsigned int index)\n } \\n } while (0)\n \n-void gf_assert(void);\n+void\n+gf_assert(void);\n \n #ifdef DEBUG\n #define GF_ASSERT(x) assert(x);\ndiff --git a/xlators/debug/io-stats/src/io-stats.c b/xlators/debug/io-stats/src/io-stats.c\nindex 0eac50117..a36336736 100644\n--- a/xlators/debug/io-stats/src/io-stats.c\n+++ b/xlators/debug/io-stats/src/io-stats.c\n@@ -3765,10 +3765,10 @@ reconfigure(xlator_t *this, dict_t *options)\n GF_OPTION_RECONF("ios-dump-format", dump_format_str, options, str, out);\n ios_set_log_format_code(conf, dump_format_str);\n if (conf->ios_sample_interval) {\n- GF_OPTION_RECONF("ios-sample-buf-size", conf->ios_sample_buf_size, options,\n- int32, out);\n+ GF_OPTION_RECONF("ios-sample-buf-size", conf->ios_sample_buf_size,\n+ options, int32, out);\n } else {\n- ios_sample_buf_size_configure (this->name, conf);\n+ ios_sample_buf_size_configure(this->name, conf);\n }\n \n GF_OPTION_RECONF("sys-log-level", sys_log_str, options, str, out);\n@@ -3951,7 +3951,7 @@ init(xlator_t *this)\n GF_OPTION_INIT("ios-sample-buf-size", conf->ios_sample_buf_size, int32,\n out);\n } else {\n- ios_sample_buf_size_configure (this->name, conf);\n+ ios_sample_buf_size_configure(this->name, conf);\n }\n \n ret = ios_init_sample_buf(conf);\ndiff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c\nindex 5652b7e69..a9f7353f7 100644\n--- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c\n+++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c\n@@ -1460,12 +1460,10 @@ struct volopt_map_entry glusterd_volopt_map[] = {\n .voltype = "performance/md-cache",\n .option = "pass-through",\n .op_version = GD_OP_VERSION_4_1_0},\n- {\n- .key = "performance.write-behind-pass-through",\n- .voltype = "performance/write-behind",\n- .option = "pass-through",\n- .op_version = GD_OP_VERSION_9_0\n- },\n+ {.key = "performance.write-behind-pass-through",\n+ .voltype = "performance/write-behind",\n+ .option = "pass-through",\n+ .op_version = GD_OP_VERSION_9_0},\n {.key = "performance.md-cache-timeout",\n .voltype = "performance/md-cache",\n .option = "md-cache-timeout",\ndiff --git a/xlators/performance/write-behind/src/write-behind.c b/xlators/performance/write-behind/src/write-behind.c\nindex c46ffb19e..243ed511c 100644\n--- a/xlators/performance/write-behind/src/write-behind.c\n+++ b/xlators/performance/write-behind/src/write-behind.c\n@@ -3191,15 +3191,13 @@ struct volume_options options[] = {\n .op_version = {GD_OP_VERSION_6_0},\n .flags = OPT_FLAG_SETTABLE,\n },\n- {\n- .key = {"pass-through"},\n- .type = GF_OPTION_TYPE_BOOL,\n- .default_value = "false",\n- .op_version = {GD_OP_VERSION_9_0},\n- .flags = OPT_FLAG_SETTABLE | OPT_FLAG_DOC | OPT_FLAG_CLIENT_OPT,\n- .tags = {"write-behind"},\n- .description = "Enable/disable write-behind pass-through"\n- },\n+ {.key = {"pass-through"},\n+ .type = GF_OPTION_TYPE_BOOL,\n+ .default_value = "false",\n+ .op_version = {GD_OP_VERSION_9_0},\n+ .flags = OPT_FLAG_SETTABLE | OPT_FLAG_DOC | OPT_FLAG_CLIENT_OPT,\n+ .tags = {"write-behind"},\n+ .description = "Enable/disable write-behind pass-through"},\n {.key = {"flush-behind"},\n .type = GF_OPTION_TYPE_BOOL,\n .default_value = "on",\n'
/recheck clang-format
CLANG-FORMAT FAILURE: Before merging the patch, this diff needs to be considered for passing clang-format
index 9c684385f..9f9d731b7 100644
--- a/libglusterfs/src/common-utils.c
+++ b/libglusterfs/src/common-utils.c
@@ -90,12 +90,12 @@ char *xattrs_to_heal[] = {"user.",
GF_XATTR_MDATA_KEY,
NULL};
-void gf_assert(void)
+void
+gf_assert(void)
{
if (gf_signal_on_assert) {
raise(SIGCONT);
}
-
}
void
diff --git a/libglusterfs/src/glusterfs/common-utils.h b/libglusterfs/src/glusterfs/common-utils.h
index c8014a127..6974c82f9 100644
--- a/libglusterfs/src/glusterfs/common-utils.h
+++ b/libglusterfs/src/glusterfs/common-utils.h
@@ -444,7 +444,8 @@ BIT_VALUE(unsigned char *array, unsigned int index)
} \
} while (0)
-void gf_assert(void);
+void
+gf_assert(void);
#ifdef DEBUG
#define GF_ASSERT(x) assert(x);
diff --git a/xlators/debug/io-stats/src/io-stats.c b/xlators/debug/io-stats/src/io-stats.c
index 0eac50117..a36336736 100644
--- a/xlators/debug/io-stats/src/io-stats.c
+++ b/xlators/debug/io-stats/src/io-stats.c
@@ -3765,10 +3765,10 @@ reconfigure(xlator_t *this, dict_t *options)
GF_OPTION_RECONF("ios-dump-format", dump_format_str, options, str, out);
ios_set_log_format_code(conf, dump_format_str);
if (conf->ios_sample_interval) {
- GF_OPTION_RECONF("ios-sample-buf-size", conf->ios_sample_buf_size, options,
- int32, out);
+ GF_OPTION_RECONF("ios-sample-buf-size", conf->ios_sample_buf_size,
+ options, int32, out);
} else {
- ios_sample_buf_size_configure (this->name, conf);
+ ios_sample_buf_size_configure(this->name, conf);
}
GF_OPTION_RECONF("sys-log-level", sys_log_str, options, str, out);
@@ -3951,7 +3951,7 @@ init(xlator_t *this)
GF_OPTION_INIT("ios-sample-buf-size", conf->ios_sample_buf_size, int32,
out);
} else {
- ios_sample_buf_size_configure (this->name, conf);
+ ios_sample_buf_size_configure(this->name, conf);
}
ret = ios_init_sample_buf(conf);
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
index 5652b7e69..a9f7353f7 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
@@ -1460,12 +1460,10 @@ struct volopt_map_entry glusterd_volopt_map[] = {
.voltype = "performance/md-cache",
.option = "pass-through",
.op_version = GD_OP_VERSION_4_1_0},
- {
- .key = "performance.write-behind-pass-through",
- .voltype = "performance/write-behind",
- .option = "pass-through",
- .op_version = GD_OP_VERSION_9_0
- },
+ {.key = "performance.write-behind-pass-through",
+ .voltype = "performance/write-behind",
+ .option = "pass-through",
+ .op_version = GD_OP_VERSION_9_0},
{.key = "performance.md-cache-timeout",
.voltype = "performance/md-cache",
.option = "md-cache-timeout",
diff --git a/xlators/performance/write-behind/src/write-behind.c b/xlators/performance/write-behind/src/write-behind.c
index c46ffb19e..243ed511c 100644
--- a/xlators/performance/write-behind/src/write-behind.c
+++ b/xlators/performance/write-behind/src/write-behind.c
@@ -3191,15 +3191,13 @@ struct volume_options options[] = {
.op_version = {GD_OP_VERSION_6_0},
.flags = OPT_FLAG_SETTABLE,
},
- {
- .key = {"pass-through"},
- .type = GF_OPTION_TYPE_BOOL,
- .default_value = "false",
- .op_version = {GD_OP_VERSION_9_0},
- .flags = OPT_FLAG_SETTABLE | OPT_FLAG_DOC | OPT_FLAG_CLIENT_OPT,
- .tags = {"write-behind"},
- .description = "Enable/disable write-behind pass-through"
- },
+ {.key = {"pass-through"},
+ .type = GF_OPTION_TYPE_BOOL,
+ .default_value = "false",
+ .op_version = {GD_OP_VERSION_9_0},
+ .flags = OPT_FLAG_SETTABLE | OPT_FLAG_DOC | OPT_FLAG_CLIENT_OPT,
+ .tags = {"write-behind"},
+ .description = "Enable/disable write-behind pass-through"},
{.key = {"flush-behind"},
.type = GF_OPTION_TYPE_BOOL,
.default_value = "on",
The final version is very neat :+1: Great job @deepshikhaaa!
If someone has cycles, dumping regression test failures (just the failed tests, and cores) as comment also would be great next task.
CLANG-FORMAT FAILURE: Before merging the patch, this diff needs to be considered for passing clang-format
index 9c684385f..9f9d731b7 100644
--- a/libglusterfs/src/common-utils.c
+++ b/libglusterfs/src/common-utils.c
@@ -90,12 +90,12 @@ char *xattrs_to_heal[] = {"user.",
GF_XATTR_MDATA_KEY,
NULL};
-void gf_assert(void)
+void
+gf_assert(void)
{
if (gf_signal_on_assert) {
raise(SIGCONT);
}
-
}
void
diff --git a/libglusterfs/src/glusterfs/common-utils.h b/libglusterfs/src/glusterfs/common-utils.h
index c8014a127..6974c82f9 100644
--- a/libglusterfs/src/glusterfs/common-utils.h
+++ b/libglusterfs/src/glusterfs/common-utils.h
@@ -444,7 +444,8 @@ BIT_VALUE(unsigned char *array, unsigned int index)
} \
} while (0)
-void gf_assert(void);
+void
+gf_assert(void);
#ifdef DEBUG
#define GF_ASSERT(x) assert(x);
diff --git a/xlators/debug/io-stats/src/io-stats.c b/xlators/debug/io-stats/src/io-stats.c
index 0eac50117..a36336736 100644
--- a/xlators/debug/io-stats/src/io-stats.c
+++ b/xlators/debug/io-stats/src/io-stats.c
@@ -3765,10 +3765,10 @@ reconfigure(xlator_t *this, dict_t *options)
GF_OPTION_RECONF("ios-dump-format", dump_format_str, options, str, out);
ios_set_log_format_code(conf, dump_format_str);
if (conf->ios_sample_interval) {
- GF_OPTION_RECONF("ios-sample-buf-size", conf->ios_sample_buf_size, options,
- int32, out);
+ GF_OPTION_RECONF("ios-sample-buf-size", conf->ios_sample_buf_size,
+ options, int32, out);
} else {
- ios_sample_buf_size_configure (this->name, conf);
+ ios_sample_buf_size_configure(this->name, conf);
}
GF_OPTION_RECONF("sys-log-level", sys_log_str, options, str, out);
@@ -3951,7 +3951,7 @@ init(xlator_t *this)
GF_OPTION_INIT("ios-sample-buf-size", conf->ios_sample_buf_size, int32,
out);
} else {
- ios_sample_buf_size_configure (this->name, conf);
+ ios_sample_buf_size_configure(this->name, conf);
}
ret = ios_init_sample_buf(conf);
diff --git a/xlators/features/index/src/index.c b/xlators/features/index/src/index.c
index 72f75e09c..5eb1da164 100644
--- a/xlators/features/index/src/index.c
+++ b/xlators/features/index/src/index.c
@@ -2343,7 +2343,8 @@ index_priv_dump(xlator_t *this)
snprintf(key_prefix, GF_DUMP_MAX_BUF_LEN, "%s.%s", this->type, this->name);
gf_proc_dump_add_section("%s", key_prefix);
- gf_proc_dump_write("xattrop-pending-count", "%"PRId64, priv->pending_count);
+ gf_proc_dump_write("xattrop-pending-count", "%" PRId64,
+ priv->pending_count);
return 0;
}
diff --git a/xlators/mgmt/glusterd/src/glusterd-store.c b/xlators/mgmt/glusterd/src/glusterd-store.c
index 134307cf6..51d5099ed 100644
--- a/xlators/mgmt/glusterd/src/glusterd-store.c
+++ b/xlators/mgmt/glusterd/src/glusterd-store.c
@@ -2855,7 +2855,8 @@ glusterd_store_retrieve_bricks(glusterd_volinfo_t *volinfo)
cds_list_add_tail(&ta_brickinfo->brick_list, &volinfo->ta_bricks);
ta_brick_count++;
if (gf_store_iter_destroy(&iter)) {
- gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_STORE_ITER_DESTROY_FAIL,
+ gf_msg(this->name, GF_LOG_ERROR, 0,
+ GD_MSG_STORE_ITER_DESTROY_FAIL,
"Failed to destroy store iter");
ret = -1;
goto out;
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
index 5652b7e69..a9f7353f7 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
@@ -1460,12 +1460,10 @@ struct volopt_map_entry glusterd_volopt_map[] = {
.voltype = "performance/md-cache",
.option = "pass-through",
.op_version = GD_OP_VERSION_4_1_0},
- {
- .key = "performance.write-behind-pass-through",
- .voltype = "performance/write-behind",
- .option = "pass-through",
- .op_version = GD_OP_VERSION_9_0
- },
+ {.key = "performance.write-behind-pass-through",
+ .voltype = "performance/write-behind",
+ .option = "pass-through",
+ .op_version = GD_OP_VERSION_9_0},
{.key = "performance.md-cache-timeout",
.voltype = "performance/md-cache",
.option = "md-cache-timeout",
diff --git a/xlators/performance/write-behind/src/write-behind.c b/xlators/performance/write-behind/src/write-behind.c
index c46ffb19e..243ed511c 100644
--- a/xlators/performance/write-behind/src/write-behind.c
+++ b/xlators/performance/write-behind/src/write-behind.c
@@ -3191,15 +3191,13 @@ struct volume_options options[] = {
.op_version = {GD_OP_VERSION_6_0},
.flags = OPT_FLAG_SETTABLE,
},
- {
- .key = {"pass-through"},
- .type = GF_OPTION_TYPE_BOOL,
- .default_value = "false",
- .op_version = {GD_OP_VERSION_9_0},
- .flags = OPT_FLAG_SETTABLE | OPT_FLAG_DOC | OPT_FLAG_CLIENT_OPT,
- .tags = {"write-behind"},
- .description = "Enable/disable write-behind pass-through"
- },
+ {.key = {"pass-through"},
+ .type = GF_OPTION_TYPE_BOOL,
+ .default_value = "false",
+ .op_version = {GD_OP_VERSION_9_0},
+ .flags = OPT_FLAG_SETTABLE | OPT_FLAG_DOC | OPT_FLAG_CLIENT_OPT,
+ .tags = {"write-behind"},
+ .description = "Enable/disable write-behind pass-through"},
{.key = {"flush-behind"},
.type = GF_OPTION_TYPE_BOOL,
.default_value = "on",
CLANG-FORMAT FAILURE: Before merging the patch, this diff needs to be considered for passing clang-format
index 9c684385f..9f9d731b7 100644
--- a/libglusterfs/src/common-utils.c
+++ b/libglusterfs/src/common-utils.c
@@ -90,12 +90,12 @@ char *xattrs_to_heal[] = {"user.",
GF_XATTR_MDATA_KEY,
NULL};
-void gf_assert(void)
+void
+gf_assert(void)
{
if (gf_signal_on_assert) {
raise(SIGCONT);
}
-
}
void
diff --git a/libglusterfs/src/glusterfs/common-utils.h b/libglusterfs/src/glusterfs/common-utils.h
index c8014a127..6974c82f9 100644
--- a/libglusterfs/src/glusterfs/common-utils.h
+++ b/libglusterfs/src/glusterfs/common-utils.h
@@ -444,7 +444,8 @@ BIT_VALUE(unsigned char *array, unsigned int index)
} \
} while (0)
-void gf_assert(void);
+void
+gf_assert(void);
#ifdef DEBUG
#define GF_ASSERT(x) assert(x);
diff --git a/xlators/debug/io-stats/src/io-stats.c b/xlators/debug/io-stats/src/io-stats.c
index 0eac50117..a36336736 100644
--- a/xlators/debug/io-stats/src/io-stats.c
+++ b/xlators/debug/io-stats/src/io-stats.c
@@ -3765,10 +3765,10 @@ reconfigure(xlator_t *this, dict_t *options)
GF_OPTION_RECONF("ios-dump-format", dump_format_str, options, str, out);
ios_set_log_format_code(conf, dump_format_str);
if (conf->ios_sample_interval) {
- GF_OPTION_RECONF("ios-sample-buf-size", conf->ios_sample_buf_size, options,
- int32, out);
+ GF_OPTION_RECONF("ios-sample-buf-size", conf->ios_sample_buf_size,
+ options, int32, out);
} else {
- ios_sample_buf_size_configure (this->name, conf);
+ ios_sample_buf_size_configure(this->name, conf);
}
GF_OPTION_RECONF("sys-log-level", sys_log_str, options, str, out);
@@ -3951,7 +3951,7 @@ init(xlator_t *this)
GF_OPTION_INIT("ios-sample-buf-size", conf->ios_sample_buf_size, int32,
out);
} else {
- ios_sample_buf_size_configure (this->name, conf);
+ ios_sample_buf_size_configure(this->name, conf);
}
ret = ios_init_sample_buf(conf);
diff --git a/xlators/features/index/src/index.c b/xlators/features/index/src/index.c
index 72f75e09c..5eb1da164 100644
--- a/xlators/features/index/src/index.c
+++ b/xlators/features/index/src/index.c
@@ -2343,7 +2343,8 @@ index_priv_dump(xlator_t *this)
snprintf(key_prefix, GF_DUMP_MAX_BUF_LEN, "%s.%s", this->type, this->name);
gf_proc_dump_add_section("%s", key_prefix);
- gf_proc_dump_write("xattrop-pending-count", "%"PRId64, priv->pending_count);
+ gf_proc_dump_write("xattrop-pending-count", "%" PRId64,
+ priv->pending_count);
return 0;
}
diff --git a/xlators/mgmt/glusterd/src/glusterd-store.c b/xlators/mgmt/glusterd/src/glusterd-store.c
index 134307cf6..51d5099ed 100644
--- a/xlators/mgmt/glusterd/src/glusterd-store.c
+++ b/xlators/mgmt/glusterd/src/glusterd-store.c
@@ -2855,7 +2855,8 @@ glusterd_store_retrieve_bricks(glusterd_volinfo_t *volinfo)
cds_list_add_tail(&ta_brickinfo->brick_list, &volinfo->ta_bricks);
ta_brick_count++;
if (gf_store_iter_destroy(&iter)) {
- gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_STORE_ITER_DESTROY_FAIL,
+ gf_msg(this->name, GF_LOG_ERROR, 0,
+ GD_MSG_STORE_ITER_DESTROY_FAIL,
"Failed to destroy store iter");
ret = -1;
goto out;
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
index 5652b7e69..a9f7353f7 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
@@ -1460,12 +1460,10 @@ struct volopt_map_entry glusterd_volopt_map[] = {
.voltype = "performance/md-cache",
.option = "pass-through",
.op_version = GD_OP_VERSION_4_1_0},
- {
- .key = "performance.write-behind-pass-through",
- .voltype = "performance/write-behind",
- .option = "pass-through",
- .op_version = GD_OP_VERSION_9_0
- },
+ {.key = "performance.write-behind-pass-through",
+ .voltype = "performance/write-behind",
+ .option = "pass-through",
+ .op_version = GD_OP_VERSION_9_0},
{.key = "performance.md-cache-timeout",
.voltype = "performance/md-cache",
.option = "md-cache-timeout",
diff --git a/xlators/performance/write-behind/src/write-behind.c b/xlators/performance/write-behind/src/write-behind.c
index c46ffb19e..243ed511c 100644
--- a/xlators/performance/write-behind/src/write-behind.c
+++ b/xlators/performance/write-behind/src/write-behind.c
@@ -3191,15 +3191,13 @@ struct volume_options options[] = {
.op_version = {GD_OP_VERSION_6_0},
.flags = OPT_FLAG_SETTABLE,
},
- {
- .key = {"pass-through"},
- .type = GF_OPTION_TYPE_BOOL,
- .default_value = "false",
- .op_version = {GD_OP_VERSION_9_0},
- .flags = OPT_FLAG_SETTABLE | OPT_FLAG_DOC | OPT_FLAG_CLIENT_OPT,
- .tags = {"write-behind"},
- .description = "Enable/disable write-behind pass-through"
- },
+ {.key = {"pass-through"},
+ .type = GF_OPTION_TYPE_BOOL,
+ .default_value = "false",
+ .op_version = {GD_OP_VERSION_9_0},
+ .flags = OPT_FLAG_SETTABLE | OPT_FLAG_DOC | OPT_FLAG_CLIENT_OPT,
+ .tags = {"write-behind"},
+ .description = "Enable/disable write-behind pass-through"},
{.key = {"flush-behind"},
.type = GF_OPTION_TYPE_BOOL,
.default_value = "on",
CLANG-FORMAT FAILURE: Before merging the patch, this diff needs to be considered for passing clang-format
index 9c684385f..9f9d731b7 100644
--- a/libglusterfs/src/common-utils.c
+++ b/libglusterfs/src/common-utils.c
@@ -90,12 +90,12 @@ char *xattrs_to_heal[] = {"user.",
GF_XATTR_MDATA_KEY,
NULL};
-void gf_assert(void)
+void
+gf_assert(void)
{
if (gf_signal_on_assert) {
raise(SIGCONT);
}
-
}
void
diff --git a/libglusterfs/src/glusterfs/common-utils.h b/libglusterfs/src/glusterfs/common-utils.h
index c8014a127..6974c82f9 100644
--- a/libglusterfs/src/glusterfs/common-utils.h
+++ b/libglusterfs/src/glusterfs/common-utils.h
@@ -444,7 +444,8 @@ BIT_VALUE(unsigned char *array, unsigned int index)
} \
} while (0)
-void gf_assert(void);
+void
+gf_assert(void);
#ifdef DEBUG
#define GF_ASSERT(x) assert(x);
diff --git a/xlators/debug/io-stats/src/io-stats.c b/xlators/debug/io-stats/src/io-stats.c
index 0eac50117..a36336736 100644
--- a/xlators/debug/io-stats/src/io-stats.c
+++ b/xlators/debug/io-stats/src/io-stats.c
@@ -3765,10 +3765,10 @@ reconfigure(xlator_t *this, dict_t *options)
GF_OPTION_RECONF("ios-dump-format", dump_format_str, options, str, out);
ios_set_log_format_code(conf, dump_format_str);
if (conf->ios_sample_interval) {
- GF_OPTION_RECONF("ios-sample-buf-size", conf->ios_sample_buf_size, options,
- int32, out);
+ GF_OPTION_RECONF("ios-sample-buf-size", conf->ios_sample_buf_size,
+ options, int32, out);
} else {
- ios_sample_buf_size_configure (this->name, conf);
+ ios_sample_buf_size_configure(this->name, conf);
}
GF_OPTION_RECONF("sys-log-level", sys_log_str, options, str, out);
@@ -3951,7 +3951,7 @@ init(xlator_t *this)
GF_OPTION_INIT("ios-sample-buf-size", conf->ios_sample_buf_size, int32,
out);
} else {
- ios_sample_buf_size_configure (this->name, conf);
+ ios_sample_buf_size_configure(this->name, conf);
}
ret = ios_init_sample_buf(conf);
diff --git a/xlators/features/index/src/index.c b/xlators/features/index/src/index.c
index 72f75e09c..5eb1da164 100644
--- a/xlators/features/index/src/index.c
+++ b/xlators/features/index/src/index.c
@@ -2343,7 +2343,8 @@ index_priv_dump(xlator_t *this)
snprintf(key_prefix, GF_DUMP_MAX_BUF_LEN, "%s.%s", this->type, this->name);
gf_proc_dump_add_section("%s", key_prefix);
- gf_proc_dump_write("xattrop-pending-count", "%"PRId64, priv->pending_count);
+ gf_proc_dump_write("xattrop-pending-count", "%" PRId64,
+ priv->pending_count);
return 0;
}
diff --git a/xlators/mgmt/glusterd/src/glusterd-store.c b/xlators/mgmt/glusterd/src/glusterd-store.c
index 134307cf6..51d5099ed 100644
--- a/xlators/mgmt/glusterd/src/glusterd-store.c
+++ b/xlators/mgmt/glusterd/src/glusterd-store.c
@@ -2855,7 +2855,8 @@ glusterd_store_retrieve_bricks(glusterd_volinfo_t *volinfo)
cds_list_add_tail(&ta_brickinfo->brick_list, &volinfo->ta_bricks);
ta_brick_count++;
if (gf_store_iter_destroy(&iter)) {
- gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_STORE_ITER_DESTROY_FAIL,
+ gf_msg(this->name, GF_LOG_ERROR, 0,
+ GD_MSG_STORE_ITER_DESTROY_FAIL,
"Failed to destroy store iter");
ret = -1;
goto out;
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
index 5652b7e69..a9f7353f7 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
@@ -1460,12 +1460,10 @@ struct volopt_map_entry glusterd_volopt_map[] = {
.voltype = "performance/md-cache",
.option = "pass-through",
.op_version = GD_OP_VERSION_4_1_0},
- {
- .key = "performance.write-behind-pass-through",
- .voltype = "performance/write-behind",
- .option = "pass-through",
- .op_version = GD_OP_VERSION_9_0
- },
+ {.key = "performance.write-behind-pass-through",
+ .voltype = "performance/write-behind",
+ .option = "pass-through",
+ .op_version = GD_OP_VERSION_9_0},
{.key = "performance.md-cache-timeout",
.voltype = "performance/md-cache",
.option = "md-cache-timeout",
diff --git a/xlators/performance/write-behind/src/write-behind.c b/xlators/performance/write-behind/src/write-behind.c
index c46ffb19e..243ed511c 100644
--- a/xlators/performance/write-behind/src/write-behind.c
+++ b/xlators/performance/write-behind/src/write-behind.c
@@ -3191,15 +3191,13 @@ struct volume_options options[] = {
.op_version = {GD_OP_VERSION_6_0},
.flags = OPT_FLAG_SETTABLE,
},
- {
- .key = {"pass-through"},
- .type = GF_OPTION_TYPE_BOOL,
- .default_value = "false",
- .op_version = {GD_OP_VERSION_9_0},
- .flags = OPT_FLAG_SETTABLE | OPT_FLAG_DOC | OPT_FLAG_CLIENT_OPT,
- .tags = {"write-behind"},
- .description = "Enable/disable write-behind pass-through"
- },
+ {.key = {"pass-through"},
+ .type = GF_OPTION_TYPE_BOOL,
+ .default_value = "false",
+ .op_version = {GD_OP_VERSION_9_0},
+ .flags = OPT_FLAG_SETTABLE | OPT_FLAG_DOC | OPT_FLAG_CLIENT_OPT,
+ .tags = {"write-behind"},
+ .description = "Enable/disable write-behind pass-through"},
{.key = {"flush-behind"},
.type = GF_OPTION_TYPE_BOOL,
.default_value = "on",
CLANG-FORMAT FAILURE: Before merging the patch, this diff needs to be considered for passing clang-format
index 9c684385f..9f9d731b7 100644
--- a/libglusterfs/src/common-utils.c
+++ b/libglusterfs/src/common-utils.c
@@ -90,12 +90,12 @@ char *xattrs_to_heal[] = {"user.",
GF_XATTR_MDATA_KEY,
NULL};
-void gf_assert(void)
+void
+gf_assert(void)
{
if (gf_signal_on_assert) {
raise(SIGCONT);
}
-
}
void
diff --git a/libglusterfs/src/glusterfs/common-utils.h b/libglusterfs/src/glusterfs/common-utils.h
index c8014a127..6974c82f9 100644
--- a/libglusterfs/src/glusterfs/common-utils.h
+++ b/libglusterfs/src/glusterfs/common-utils.h
@@ -444,7 +444,8 @@ BIT_VALUE(unsigned char *array, unsigned int index)
} \
} while (0)
-void gf_assert(void);
+void
+gf_assert(void);
#ifdef DEBUG
#define GF_ASSERT(x) assert(x);
diff --git a/xlators/debug/io-stats/src/io-stats.c b/xlators/debug/io-stats/src/io-stats.c
index 0eac50117..a36336736 100644
--- a/xlators/debug/io-stats/src/io-stats.c
+++ b/xlators/debug/io-stats/src/io-stats.c
@@ -3765,10 +3765,10 @@ reconfigure(xlator_t *this, dict_t *options)
GF_OPTION_RECONF("ios-dump-format", dump_format_str, options, str, out);
ios_set_log_format_code(conf, dump_format_str);
if (conf->ios_sample_interval) {
- GF_OPTION_RECONF("ios-sample-buf-size", conf->ios_sample_buf_size, options,
- int32, out);
+ GF_OPTION_RECONF("ios-sample-buf-size", conf->ios_sample_buf_size,
+ options, int32, out);
} else {
- ios_sample_buf_size_configure (this->name, conf);
+ ios_sample_buf_size_configure(this->name, conf);
}
GF_OPTION_RECONF("sys-log-level", sys_log_str, options, str, out);
@@ -3951,7 +3951,7 @@ init(xlator_t *this)
GF_OPTION_INIT("ios-sample-buf-size", conf->ios_sample_buf_size, int32,
out);
} else {
- ios_sample_buf_size_configure (this->name, conf);
+ ios_sample_buf_size_configure(this->name, conf);
}
ret = ios_init_sample_buf(conf);
diff --git a/xlators/features/index/src/index.c b/xlators/features/index/src/index.c
index 72f75e09c..5eb1da164 100644
--- a/xlators/features/index/src/index.c
+++ b/xlators/features/index/src/index.c
@@ -2343,7 +2343,8 @@ index_priv_dump(xlator_t *this)
snprintf(key_prefix, GF_DUMP_MAX_BUF_LEN, "%s.%s", this->type, this->name);
gf_proc_dump_add_section("%s", key_prefix);
- gf_proc_dump_write("xattrop-pending-count", "%"PRId64, priv->pending_count);
+ gf_proc_dump_write("xattrop-pending-count", "%" PRId64,
+ priv->pending_count);
return 0;
}
diff --git a/xlators/mgmt/glusterd/src/glusterd-store.c b/xlators/mgmt/glusterd/src/glusterd-store.c
index 134307cf6..51d5099ed 100644
--- a/xlators/mgmt/glusterd/src/glusterd-store.c
+++ b/xlators/mgmt/glusterd/src/glusterd-store.c
@@ -2855,7 +2855,8 @@ glusterd_store_retrieve_bricks(glusterd_volinfo_t *volinfo)
cds_list_add_tail(&ta_brickinfo->brick_list, &volinfo->ta_bricks);
ta_brick_count++;
if (gf_store_iter_destroy(&iter)) {
- gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_STORE_ITER_DESTROY_FAIL,
+ gf_msg(this->name, GF_LOG_ERROR, 0,
+ GD_MSG_STORE_ITER_DESTROY_FAIL,
"Failed to destroy store iter");
ret = -1;
goto out;
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
index 5652b7e69..a9f7353f7 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
@@ -1460,12 +1460,10 @@ struct volopt_map_entry glusterd_volopt_map[] = {
.voltype = "performance/md-cache",
.option = "pass-through",
.op_version = GD_OP_VERSION_4_1_0},
- {
- .key = "performance.write-behind-pass-through",
- .voltype = "performance/write-behind",
- .option = "pass-through",
- .op_version = GD_OP_VERSION_9_0
- },
+ {.key = "performance.write-behind-pass-through",
+ .voltype = "performance/write-behind",
+ .option = "pass-through",
+ .op_version = GD_OP_VERSION_9_0},
{.key = "performance.md-cache-timeout",
.voltype = "performance/md-cache",
.option = "md-cache-timeout",
diff --git a/xlators/performance/write-behind/src/write-behind.c b/xlators/performance/write-behind/src/write-behind.c
index c46ffb19e..243ed511c 100644
--- a/xlators/performance/write-behind/src/write-behind.c
+++ b/xlators/performance/write-behind/src/write-behind.c
@@ -3191,15 +3191,13 @@ struct volume_options options[] = {
.op_version = {GD_OP_VERSION_6_0},
.flags = OPT_FLAG_SETTABLE,
},
- {
- .key = {"pass-through"},
- .type = GF_OPTION_TYPE_BOOL,
- .default_value = "false",
- .op_version = {GD_OP_VERSION_9_0},
- .flags = OPT_FLAG_SETTABLE | OPT_FLAG_DOC | OPT_FLAG_CLIENT_OPT,
- .tags = {"write-behind"},
- .description = "Enable/disable write-behind pass-through"
- },
+ {.key = {"pass-through"},
+ .type = GF_OPTION_TYPE_BOOL,
+ .default_value = "false",
+ .op_version = {GD_OP_VERSION_9_0},
+ .flags = OPT_FLAG_SETTABLE | OPT_FLAG_DOC | OPT_FLAG_CLIENT_OPT,
+ .tags = {"write-behind"},
+ .description = "Enable/disable write-behind pass-through"},
{.key = {"flush-behind"},
.type = GF_OPTION_TYPE_BOOL,
.default_value = "on",
CLANG-FORMAT FAILURE: Before merging the patch, this diff needs to be considered for passing clang-format
index 9c684385f..9f9d731b7 100644
--- a/libglusterfs/src/common-utils.c
+++ b/libglusterfs/src/common-utils.c
@@ -90,12 +90,12 @@ char *xattrs_to_heal[] = {"user.",
GF_XATTR_MDATA_KEY,
NULL};
-void gf_assert(void)
+void
+gf_assert(void)
{
if (gf_signal_on_assert) {
raise(SIGCONT);
}
-
}
void
diff --git a/libglusterfs/src/glusterfs/common-utils.h b/libglusterfs/src/glusterfs/common-utils.h
index c8014a127..6974c82f9 100644
--- a/libglusterfs/src/glusterfs/common-utils.h
+++ b/libglusterfs/src/glusterfs/common-utils.h
@@ -444,7 +444,8 @@ BIT_VALUE(unsigned char *array, unsigned int index)
} \
} while (0)
-void gf_assert(void);
+void
+gf_assert(void);
#ifdef DEBUG
#define GF_ASSERT(x) assert(x);
diff --git a/xlators/debug/io-stats/src/io-stats.c b/xlators/debug/io-stats/src/io-stats.c
index 0eac50117..a36336736 100644
--- a/xlators/debug/io-stats/src/io-stats.c
+++ b/xlators/debug/io-stats/src/io-stats.c
@@ -3765,10 +3765,10 @@ reconfigure(xlator_t *this, dict_t *options)
GF_OPTION_RECONF("ios-dump-format", dump_format_str, options, str, out);
ios_set_log_format_code(conf, dump_format_str);
if (conf->ios_sample_interval) {
- GF_OPTION_RECONF("ios-sample-buf-size", conf->ios_sample_buf_size, options,
- int32, out);
+ GF_OPTION_RECONF("ios-sample-buf-size", conf->ios_sample_buf_size,
+ options, int32, out);
} else {
- ios_sample_buf_size_configure (this->name, conf);
+ ios_sample_buf_size_configure(this->name, conf);
}
GF_OPTION_RECONF("sys-log-level", sys_log_str, options, str, out);
@@ -3951,7 +3951,7 @@ init(xlator_t *this)
GF_OPTION_INIT("ios-sample-buf-size", conf->ios_sample_buf_size, int32,
out);
} else {
- ios_sample_buf_size_configure (this->name, conf);
+ ios_sample_buf_size_configure(this->name, conf);
}
ret = ios_init_sample_buf(conf);
diff --git a/xlators/features/index/src/index.c b/xlators/features/index/src/index.c
index 72f75e09c..5eb1da164 100644
--- a/xlators/features/index/src/index.c
+++ b/xlators/features/index/src/index.c
@@ -2343,7 +2343,8 @@ index_priv_dump(xlator_t *this)
snprintf(key_prefix, GF_DUMP_MAX_BUF_LEN, "%s.%s", this->type, this->name);
gf_proc_dump_add_section("%s", key_prefix);
- gf_proc_dump_write("xattrop-pending-count", "%"PRId64, priv->pending_count);
+ gf_proc_dump_write("xattrop-pending-count", "%" PRId64,
+ priv->pending_count);
return 0;
}
diff --git a/xlators/mgmt/glusterd/src/glusterd-store.c b/xlators/mgmt/glusterd/src/glusterd-store.c
index 134307cf6..51d5099ed 100644
--- a/xlators/mgmt/glusterd/src/glusterd-store.c
+++ b/xlators/mgmt/glusterd/src/glusterd-store.c
@@ -2855,7 +2855,8 @@ glusterd_store_retrieve_bricks(glusterd_volinfo_t *volinfo)
cds_list_add_tail(&ta_brickinfo->brick_list, &volinfo->ta_bricks);
ta_brick_count++;
if (gf_store_iter_destroy(&iter)) {
- gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_STORE_ITER_DESTROY_FAIL,
+ gf_msg(this->name, GF_LOG_ERROR, 0,
+ GD_MSG_STORE_ITER_DESTROY_FAIL,
"Failed to destroy store iter");
ret = -1;
goto out;
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
index 5652b7e69..a9f7353f7 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
@@ -1460,12 +1460,10 @@ struct volopt_map_entry glusterd_volopt_map[] = {
.voltype = "performance/md-cache",
.option = "pass-through",
.op_version = GD_OP_VERSION_4_1_0},
- {
- .key = "performance.write-behind-pass-through",
- .voltype = "performance/write-behind",
- .option = "pass-through",
- .op_version = GD_OP_VERSION_9_0
- },
+ {.key = "performance.write-behind-pass-through",
+ .voltype = "performance/write-behind",
+ .option = "pass-through",
+ .op_version = GD_OP_VERSION_9_0},
{.key = "performance.md-cache-timeout",
.voltype = "performance/md-cache",
.option = "md-cache-timeout",
diff --git a/xlators/performance/write-behind/src/write-behind.c b/xlators/performance/write-behind/src/write-behind.c
index c46ffb19e..243ed511c 100644
--- a/xlators/performance/write-behind/src/write-behind.c
+++ b/xlators/performance/write-behind/src/write-behind.c
@@ -3191,15 +3191,13 @@ struct volume_options options[] = {
.op_version = {GD_OP_VERSION_6_0},
.flags = OPT_FLAG_SETTABLE,
},
- {
- .key = {"pass-through"},
- .type = GF_OPTION_TYPE_BOOL,
- .default_value = "false",
- .op_version = {GD_OP_VERSION_9_0},
- .flags = OPT_FLAG_SETTABLE | OPT_FLAG_DOC | OPT_FLAG_CLIENT_OPT,
- .tags = {"write-behind"},
- .description = "Enable/disable write-behind pass-through"
- },
+ {.key = {"pass-through"},
+ .type = GF_OPTION_TYPE_BOOL,
+ .default_value = "false",
+ .op_version = {GD_OP_VERSION_9_0},
+ .flags = OPT_FLAG_SETTABLE | OPT_FLAG_DOC | OPT_FLAG_CLIENT_OPT,
+ .tags = {"write-behind"},
+ .description = "Enable/disable write-behind pass-through"},
{.key = {"flush-behind"},
.type = GF_OPTION_TYPE_BOOL,
.default_value = "on",
CLANG-FORMAT FAILURE: Before merging the patch, this diff needs to be considered for passing clang-format
index 9c684385f..9f9d731b7 100644
--- a/libglusterfs/src/common-utils.c
+++ b/libglusterfs/src/common-utils.c
@@ -90,12 +90,12 @@ char *xattrs_to_heal[] = {"user.",
GF_XATTR_MDATA_KEY,
NULL};
-void gf_assert(void)
+void
+gf_assert(void)
{
if (gf_signal_on_assert) {
raise(SIGCONT);
}
-
}
void
diff --git a/libglusterfs/src/glusterfs/common-utils.h b/libglusterfs/src/glusterfs/common-utils.h
index c8014a127..6974c82f9 100644
--- a/libglusterfs/src/glusterfs/common-utils.h
+++ b/libglusterfs/src/glusterfs/common-utils.h
@@ -444,7 +444,8 @@ BIT_VALUE(unsigned char *array, unsigned int index)
} \
} while (0)
-void gf_assert(void);
+void
+gf_assert(void);
#ifdef DEBUG
#define GF_ASSERT(x) assert(x);
diff --git a/xlators/debug/io-stats/src/io-stats.c b/xlators/debug/io-stats/src/io-stats.c
index 0eac50117..a36336736 100644
--- a/xlators/debug/io-stats/src/io-stats.c
+++ b/xlators/debug/io-stats/src/io-stats.c
@@ -3765,10 +3765,10 @@ reconfigure(xlator_t *this, dict_t *options)
GF_OPTION_RECONF("ios-dump-format", dump_format_str, options, str, out);
ios_set_log_format_code(conf, dump_format_str);
if (conf->ios_sample_interval) {
- GF_OPTION_RECONF("ios-sample-buf-size", conf->ios_sample_buf_size, options,
- int32, out);
+ GF_OPTION_RECONF("ios-sample-buf-size", conf->ios_sample_buf_size,
+ options, int32, out);
} else {
- ios_sample_buf_size_configure (this->name, conf);
+ ios_sample_buf_size_configure(this->name, conf);
}
GF_OPTION_RECONF("sys-log-level", sys_log_str, options, str, out);
@@ -3951,7 +3951,7 @@ init(xlator_t *this)
GF_OPTION_INIT("ios-sample-buf-size", conf->ios_sample_buf_size, int32,
out);
} else {
- ios_sample_buf_size_configure (this->name, conf);
+ ios_sample_buf_size_configure(this->name, conf);
}
ret = ios_init_sample_buf(conf);
diff --git a/xlators/features/index/src/index.c b/xlators/features/index/src/index.c
index 72f75e09c..5eb1da164 100644
--- a/xlators/features/index/src/index.c
+++ b/xlators/features/index/src/index.c
@@ -2343,7 +2343,8 @@ index_priv_dump(xlator_t *this)
snprintf(key_prefix, GF_DUMP_MAX_BUF_LEN, "%s.%s", this->type, this->name);
gf_proc_dump_add_section("%s", key_prefix);
- gf_proc_dump_write("xattrop-pending-count", "%"PRId64, priv->pending_count);
+ gf_proc_dump_write("xattrop-pending-count", "%" PRId64,
+ priv->pending_count);
return 0;
}
diff --git a/xlators/mgmt/glusterd/src/glusterd-store.c b/xlators/mgmt/glusterd/src/glusterd-store.c
index 134307cf6..51d5099ed 100644
--- a/xlators/mgmt/glusterd/src/glusterd-store.c
+++ b/xlators/mgmt/glusterd/src/glusterd-store.c
@@ -2855,7 +2855,8 @@ glusterd_store_retrieve_bricks(glusterd_volinfo_t *volinfo)
cds_list_add_tail(&ta_brickinfo->brick_list, &volinfo->ta_bricks);
ta_brick_count++;
if (gf_store_iter_destroy(&iter)) {
- gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_STORE_ITER_DESTROY_FAIL,
+ gf_msg(this->name, GF_LOG_ERROR, 0,
+ GD_MSG_STORE_ITER_DESTROY_FAIL,
"Failed to destroy store iter");
ret = -1;
goto out;
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
index 5652b7e69..a9f7353f7 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
@@ -1460,12 +1460,10 @@ struct volopt_map_entry glusterd_volopt_map[] = {
.voltype = "performance/md-cache",
.option = "pass-through",
.op_version = GD_OP_VERSION_4_1_0},
- {
- .key = "performance.write-behind-pass-through",
- .voltype = "performance/write-behind",
- .option = "pass-through",
- .op_version = GD_OP_VERSION_9_0
- },
+ {.key = "performance.write-behind-pass-through",
+ .voltype = "performance/write-behind",
+ .option = "pass-through",
+ .op_version = GD_OP_VERSION_9_0},
{.key = "performance.md-cache-timeout",
.voltype = "performance/md-cache",
.option = "md-cache-timeout",
diff --git a/xlators/performance/write-behind/src/write-behind.c b/xlators/performance/write-behind/src/write-behind.c
index c46ffb19e..243ed511c 100644
--- a/xlators/performance/write-behind/src/write-behind.c
+++ b/xlators/performance/write-behind/src/write-behind.c
@@ -3191,15 +3191,13 @@ struct volume_options options[] = {
.op_version = {GD_OP_VERSION_6_0},
.flags = OPT_FLAG_SETTABLE,
},
- {
- .key = {"pass-through"},
- .type = GF_OPTION_TYPE_BOOL,
- .default_value = "false",
- .op_version = {GD_OP_VERSION_9_0},
- .flags = OPT_FLAG_SETTABLE | OPT_FLAG_DOC | OPT_FLAG_CLIENT_OPT,
- .tags = {"write-behind"},
- .description = "Enable/disable write-behind pass-through"
- },
+ {.key = {"pass-through"},
+ .type = GF_OPTION_TYPE_BOOL,
+ .default_value = "false",
+ .op_version = {GD_OP_VERSION_9_0},
+ .flags = OPT_FLAG_SETTABLE | OPT_FLAG_DOC | OPT_FLAG_CLIENT_OPT,
+ .tags = {"write-behind"},
+ .description = "Enable/disable write-behind pass-through"},
{.key = {"flush-behind"},
.type = GF_OPTION_TYPE_BOOL,
.default_value = "on",
CLANG-FORMAT FAILURE: Before merging the patch, this diff needs to be considered for passing clang-format
index 9c684385f..9f9d731b7 100644
--- a/libglusterfs/src/common-utils.c
+++ b/libglusterfs/src/common-utils.c
@@ -90,12 +90,12 @@ char *xattrs_to_heal[] = {"user.",
GF_XATTR_MDATA_KEY,
NULL};
-void gf_assert(void)
+void
+gf_assert(void)
{
if (gf_signal_on_assert) {
raise(SIGCONT);
}
-
}
void
diff --git a/libglusterfs/src/glusterfs/common-utils.h b/libglusterfs/src/glusterfs/common-utils.h
index c8014a127..6974c82f9 100644
--- a/libglusterfs/src/glusterfs/common-utils.h
+++ b/libglusterfs/src/glusterfs/common-utils.h
@@ -444,7 +444,8 @@ BIT_VALUE(unsigned char *array, unsigned int index)
} \
} while (0)
-void gf_assert(void);
+void
+gf_assert(void);
#ifdef DEBUG
#define GF_ASSERT(x) assert(x);
diff --git a/xlators/debug/io-stats/src/io-stats.c b/xlators/debug/io-stats/src/io-stats.c
index 0eac50117..a36336736 100644
--- a/xlators/debug/io-stats/src/io-stats.c
+++ b/xlators/debug/io-stats/src/io-stats.c
@@ -3765,10 +3765,10 @@ reconfigure(xlator_t *this, dict_t *options)
GF_OPTION_RECONF("ios-dump-format", dump_format_str, options, str, out);
ios_set_log_format_code(conf, dump_format_str);
if (conf->ios_sample_interval) {
- GF_OPTION_RECONF("ios-sample-buf-size", conf->ios_sample_buf_size, options,
- int32, out);
+ GF_OPTION_RECONF("ios-sample-buf-size", conf->ios_sample_buf_size,
+ options, int32, out);
} else {
- ios_sample_buf_size_configure (this->name, conf);
+ ios_sample_buf_size_configure(this->name, conf);
}
GF_OPTION_RECONF("sys-log-level", sys_log_str, options, str, out);
@@ -3951,7 +3951,7 @@ init(xlator_t *this)
GF_OPTION_INIT("ios-sample-buf-size", conf->ios_sample_buf_size, int32,
out);
} else {
- ios_sample_buf_size_configure (this->name, conf);
+ ios_sample_buf_size_configure(this->name, conf);
}
ret = ios_init_sample_buf(conf);
diff --git a/xlators/features/index/src/index.c b/xlators/features/index/src/index.c
index 72f75e09c..5eb1da164 100644
--- a/xlators/features/index/src/index.c
+++ b/xlators/features/index/src/index.c
@@ -2343,7 +2343,8 @@ index_priv_dump(xlator_t *this)
snprintf(key_prefix, GF_DUMP_MAX_BUF_LEN, "%s.%s", this->type, this->name);
gf_proc_dump_add_section("%s", key_prefix);
- gf_proc_dump_write("xattrop-pending-count", "%"PRId64, priv->pending_count);
+ gf_proc_dump_write("xattrop-pending-count", "%" PRId64,
+ priv->pending_count);
return 0;
}
diff --git a/xlators/mgmt/glusterd/src/glusterd-store.c b/xlators/mgmt/glusterd/src/glusterd-store.c
index 134307cf6..51d5099ed 100644
--- a/xlators/mgmt/glusterd/src/glusterd-store.c
+++ b/xlators/mgmt/glusterd/src/glusterd-store.c
@@ -2855,7 +2855,8 @@ glusterd_store_retrieve_bricks(glusterd_volinfo_t *volinfo)
cds_list_add_tail(&ta_brickinfo->brick_list, &volinfo->ta_bricks);
ta_brick_count++;
if (gf_store_iter_destroy(&iter)) {
- gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_STORE_ITER_DESTROY_FAIL,
+ gf_msg(this->name, GF_LOG_ERROR, 0,
+ GD_MSG_STORE_ITER_DESTROY_FAIL,
"Failed to destroy store iter");
ret = -1;
goto out;
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
index 5652b7e69..a9f7353f7 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
@@ -1460,12 +1460,10 @@ struct volopt_map_entry glusterd_volopt_map[] = {
.voltype = "performance/md-cache",
.option = "pass-through",
.op_version = GD_OP_VERSION_4_1_0},
- {
- .key = "performance.write-behind-pass-through",
- .voltype = "performance/write-behind",
- .option = "pass-through",
- .op_version = GD_OP_VERSION_9_0
- },
+ {.key = "performance.write-behind-pass-through",
+ .voltype = "performance/write-behind",
+ .option = "pass-through",
+ .op_version = GD_OP_VERSION_9_0},
{.key = "performance.md-cache-timeout",
.voltype = "performance/md-cache",
.option = "md-cache-timeout",
diff --git a/xlators/performance/write-behind/src/write-behind.c b/xlators/performance/write-behind/src/write-behind.c
index c46ffb19e..243ed511c 100644
--- a/xlators/performance/write-behind/src/write-behind.c
+++ b/xlators/performance/write-behind/src/write-behind.c
@@ -3191,15 +3191,13 @@ struct volume_options options[] = {
.op_version = {GD_OP_VERSION_6_0},
.flags = OPT_FLAG_SETTABLE,
},
- {
- .key = {"pass-through"},
- .type = GF_OPTION_TYPE_BOOL,
- .default_value = "false",
- .op_version = {GD_OP_VERSION_9_0},
- .flags = OPT_FLAG_SETTABLE | OPT_FLAG_DOC | OPT_FLAG_CLIENT_OPT,
- .tags = {"write-behind"},
- .description = "Enable/disable write-behind pass-through"
- },
+ {.key = {"pass-through"},
+ .type = GF_OPTION_TYPE_BOOL,
+ .default_value = "false",
+ .op_version = {GD_OP_VERSION_9_0},
+ .flags = OPT_FLAG_SETTABLE | OPT_FLAG_DOC | OPT_FLAG_CLIENT_OPT,
+ .tags = {"write-behind"},
+ .description = "Enable/disable write-behind pass-through"},
{.key = {"flush-behind"},
.type = GF_OPTION_TYPE_BOOL,
.default_value = "on",
CLANG-FORMAT FAILURE: Before merging the patch, this diff needs to be considered for passing clang-format
index 9c684385f..9f9d731b7 100644
--- a/libglusterfs/src/common-utils.c
+++ b/libglusterfs/src/common-utils.c
@@ -90,12 +90,12 @@ char *xattrs_to_heal[] = {"user.",
GF_XATTR_MDATA_KEY,
NULL};
-void gf_assert(void)
+void
+gf_assert(void)
{
if (gf_signal_on_assert) {
raise(SIGCONT);
}
-
}
void
diff --git a/libglusterfs/src/glusterfs/common-utils.h b/libglusterfs/src/glusterfs/common-utils.h
index c8014a127..6974c82f9 100644
--- a/libglusterfs/src/glusterfs/common-utils.h
+++ b/libglusterfs/src/glusterfs/common-utils.h
@@ -444,7 +444,8 @@ BIT_VALUE(unsigned char *array, unsigned int index)
} \
} while (0)
-void gf_assert(void);
+void
+gf_assert(void);
#ifdef DEBUG
#define GF_ASSERT(x) assert(x);
diff --git a/xlators/debug/io-stats/src/io-stats.c b/xlators/debug/io-stats/src/io-stats.c
index 0eac50117..a36336736 100644
--- a/xlators/debug/io-stats/src/io-stats.c
+++ b/xlators/debug/io-stats/src/io-stats.c
@@ -3765,10 +3765,10 @@ reconfigure(xlator_t *this, dict_t *options)
GF_OPTION_RECONF("ios-dump-format", dump_format_str, options, str, out);
ios_set_log_format_code(conf, dump_format_str);
if (conf->ios_sample_interval) {
- GF_OPTION_RECONF("ios-sample-buf-size", conf->ios_sample_buf_size, options,
- int32, out);
+ GF_OPTION_RECONF("ios-sample-buf-size", conf->ios_sample_buf_size,
+ options, int32, out);
} else {
- ios_sample_buf_size_configure (this->name, conf);
+ ios_sample_buf_size_configure(this->name, conf);
}
GF_OPTION_RECONF("sys-log-level", sys_log_str, options, str, out);
@@ -3951,7 +3951,7 @@ init(xlator_t *this)
GF_OPTION_INIT("ios-sample-buf-size", conf->ios_sample_buf_size, int32,
out);
} else {
- ios_sample_buf_size_configure (this->name, conf);
+ ios_sample_buf_size_configure(this->name, conf);
}
ret = ios_init_sample_buf(conf);
diff --git a/xlators/features/index/src/index.c b/xlators/features/index/src/index.c
index 72f75e09c..5eb1da164 100644
--- a/xlators/features/index/src/index.c
+++ b/xlators/features/index/src/index.c
@@ -2343,7 +2343,8 @@ index_priv_dump(xlator_t *this)
snprintf(key_prefix, GF_DUMP_MAX_BUF_LEN, "%s.%s", this->type, this->name);
gf_proc_dump_add_section("%s", key_prefix);
- gf_proc_dump_write("xattrop-pending-count", "%"PRId64, priv->pending_count);
+ gf_proc_dump_write("xattrop-pending-count", "%" PRId64,
+ priv->pending_count);
return 0;
}
diff --git a/xlators/mgmt/glusterd/src/glusterd-store.c b/xlators/mgmt/glusterd/src/glusterd-store.c
index 134307cf6..51d5099ed 100644
--- a/xlators/mgmt/glusterd/src/glusterd-store.c
+++ b/xlators/mgmt/glusterd/src/glusterd-store.c
@@ -2855,7 +2855,8 @@ glusterd_store_retrieve_bricks(glusterd_volinfo_t *volinfo)
cds_list_add_tail(&ta_brickinfo->brick_list, &volinfo->ta_bricks);
ta_brick_count++;
if (gf_store_iter_destroy(&iter)) {
- gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_STORE_ITER_DESTROY_FAIL,
+ gf_msg(this->name, GF_LOG_ERROR, 0,
+ GD_MSG_STORE_ITER_DESTROY_FAIL,
"Failed to destroy store iter");
ret = -1;
goto out;
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
index 5652b7e69..a9f7353f7 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
@@ -1460,12 +1460,10 @@ struct volopt_map_entry glusterd_volopt_map[] = {
.voltype = "performance/md-cache",
.option = "pass-through",
.op_version = GD_OP_VERSION_4_1_0},
- {
- .key = "performance.write-behind-pass-through",
- .voltype = "performance/write-behind",
- .option = "pass-through",
- .op_version = GD_OP_VERSION_9_0
- },
+ {.key = "performance.write-behind-pass-through",
+ .voltype = "performance/write-behind",
+ .option = "pass-through",
+ .op_version = GD_OP_VERSION_9_0},
{.key = "performance.md-cache-timeout",
.voltype = "performance/md-cache",
.option = "md-cache-timeout",
diff --git a/xlators/performance/write-behind/src/write-behind.c b/xlators/performance/write-behind/src/write-behind.c
index c46ffb19e..243ed511c 100644
--- a/xlators/performance/write-behind/src/write-behind.c
+++ b/xlators/performance/write-behind/src/write-behind.c
@@ -3191,15 +3191,13 @@ struct volume_options options[] = {
.op_version = {GD_OP_VERSION_6_0},
.flags = OPT_FLAG_SETTABLE,
},
- {
- .key = {"pass-through"},
- .type = GF_OPTION_TYPE_BOOL,
- .default_value = "false",
- .op_version = {GD_OP_VERSION_9_0},
- .flags = OPT_FLAG_SETTABLE | OPT_FLAG_DOC | OPT_FLAG_CLIENT_OPT,
- .tags = {"write-behind"},
- .description = "Enable/disable write-behind pass-through"
- },
+ {.key = {"pass-through"},
+ .type = GF_OPTION_TYPE_BOOL,
+ .default_value = "false",
+ .op_version = {GD_OP_VERSION_9_0},
+ .flags = OPT_FLAG_SETTABLE | OPT_FLAG_DOC | OPT_FLAG_CLIENT_OPT,
+ .tags = {"write-behind"},
+ .description = "Enable/disable write-behind pass-through"},
{.key = {"flush-behind"},
.type = GF_OPTION_TYPE_BOOL,
.default_value = "on",
CLANG-FORMAT FAILURE: Before merging the patch, this diff needs to be considered for passing clang-format
index 9c684385f..9f9d731b7 100644
--- a/libglusterfs/src/common-utils.c
+++ b/libglusterfs/src/common-utils.c
@@ -90,12 +90,12 @@ char *xattrs_to_heal[] = {"user.",
GF_XATTR_MDATA_KEY,
NULL};
-void gf_assert(void)
+void
+gf_assert(void)
{
if (gf_signal_on_assert) {
raise(SIGCONT);
}
-
}
void
diff --git a/libglusterfs/src/glusterfs/common-utils.h b/libglusterfs/src/glusterfs/common-utils.h
index c8014a127..6974c82f9 100644
--- a/libglusterfs/src/glusterfs/common-utils.h
+++ b/libglusterfs/src/glusterfs/common-utils.h
@@ -444,7 +444,8 @@ BIT_VALUE(unsigned char *array, unsigned int index)
} \
} while (0)
-void gf_assert(void);
+void
+gf_assert(void);
#ifdef DEBUG
#define GF_ASSERT(x) assert(x);
diff --git a/xlators/debug/io-stats/src/io-stats.c b/xlators/debug/io-stats/src/io-stats.c
index 0eac50117..a36336736 100644
--- a/xlators/debug/io-stats/src/io-stats.c
+++ b/xlators/debug/io-stats/src/io-stats.c
@@ -3765,10 +3765,10 @@ reconfigure(xlator_t *this, dict_t *options)
GF_OPTION_RECONF("ios-dump-format", dump_format_str, options, str, out);
ios_set_log_format_code(conf, dump_format_str);
if (conf->ios_sample_interval) {
- GF_OPTION_RECONF("ios-sample-buf-size", conf->ios_sample_buf_size, options,
- int32, out);
+ GF_OPTION_RECONF("ios-sample-buf-size", conf->ios_sample_buf_size,
+ options, int32, out);
} else {
- ios_sample_buf_size_configure (this->name, conf);
+ ios_sample_buf_size_configure(this->name, conf);
}
GF_OPTION_RECONF("sys-log-level", sys_log_str, options, str, out);
@@ -3951,7 +3951,7 @@ init(xlator_t *this)
GF_OPTION_INIT("ios-sample-buf-size", conf->ios_sample_buf_size, int32,
out);
} else {
- ios_sample_buf_size_configure (this->name, conf);
+ ios_sample_buf_size_configure(this->name, conf);
}
ret = ios_init_sample_buf(conf);
diff --git a/xlators/features/index/src/index.c b/xlators/features/index/src/index.c
index 72f75e09c..5eb1da164 100644
--- a/xlators/features/index/src/index.c
+++ b/xlators/features/index/src/index.c
@@ -2343,7 +2343,8 @@ index_priv_dump(xlator_t *this)
snprintf(key_prefix, GF_DUMP_MAX_BUF_LEN, "%s.%s", this->type, this->name);
gf_proc_dump_add_section("%s", key_prefix);
- gf_proc_dump_write("xattrop-pending-count", "%"PRId64, priv->pending_count);
+ gf_proc_dump_write("xattrop-pending-count", "%" PRId64,
+ priv->pending_count);
return 0;
}
diff --git a/xlators/mgmt/glusterd/src/glusterd-store.c b/xlators/mgmt/glusterd/src/glusterd-store.c
index 134307cf6..51d5099ed 100644
--- a/xlators/mgmt/glusterd/src/glusterd-store.c
+++ b/xlators/mgmt/glusterd/src/glusterd-store.c
@@ -2855,7 +2855,8 @@ glusterd_store_retrieve_bricks(glusterd_volinfo_t *volinfo)
cds_list_add_tail(&ta_brickinfo->brick_list, &volinfo->ta_bricks);
ta_brick_count++;
if (gf_store_iter_destroy(&iter)) {
- gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_STORE_ITER_DESTROY_FAIL,
+ gf_msg(this->name, GF_LOG_ERROR, 0,
+ GD_MSG_STORE_ITER_DESTROY_FAIL,
"Failed to destroy store iter");
ret = -1;
goto out;
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
index 5652b7e69..a9f7353f7 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
@@ -1460,12 +1460,10 @@ struct volopt_map_entry glusterd_volopt_map[] = {
.voltype = "performance/md-cache",
.option = "pass-through",
.op_version = GD_OP_VERSION_4_1_0},
- {
- .key = "performance.write-behind-pass-through",
- .voltype = "performance/write-behind",
- .option = "pass-through",
- .op_version = GD_OP_VERSION_9_0
- },
+ {.key = "performance.write-behind-pass-through",
+ .voltype = "performance/write-behind",
+ .option = "pass-through",
+ .op_version = GD_OP_VERSION_9_0},
{.key = "performance.md-cache-timeout",
.voltype = "performance/md-cache",
.option = "md-cache-timeout",
diff --git a/xlators/performance/write-behind/src/write-behind.c b/xlators/performance/write-behind/src/write-behind.c
index c46ffb19e..243ed511c 100644
--- a/xlators/performance/write-behind/src/write-behind.c
+++ b/xlators/performance/write-behind/src/write-behind.c
@@ -3191,15 +3191,13 @@ struct volume_options options[] = {
.op_version = {GD_OP_VERSION_6_0},
.flags = OPT_FLAG_SETTABLE,
},
- {
- .key = {"pass-through"},
- .type = GF_OPTION_TYPE_BOOL,
- .default_value = "false",
- .op_version = {GD_OP_VERSION_9_0},
- .flags = OPT_FLAG_SETTABLE | OPT_FLAG_DOC | OPT_FLAG_CLIENT_OPT,
- .tags = {"write-behind"},
- .description = "Enable/disable write-behind pass-through"
- },
+ {.key = {"pass-through"},
+ .type = GF_OPTION_TYPE_BOOL,
+ .default_value = "false",
+ .op_version = {GD_OP_VERSION_9_0},
+ .flags = OPT_FLAG_SETTABLE | OPT_FLAG_DOC | OPT_FLAG_CLIENT_OPT,
+ .tags = {"write-behind"},
+ .description = "Enable/disable write-behind pass-through"},
{.key = {"flush-behind"},
.type = GF_OPTION_TYPE_BOOL,
.default_value = "on",
CLANG-FORMAT FAILURE: Before merging the patch, this diff needs to be considered for passing clang-format
index 9c684385f..9f9d731b7 100644
--- a/libglusterfs/src/common-utils.c
+++ b/libglusterfs/src/common-utils.c
@@ -90,12 +90,12 @@ char *xattrs_to_heal[] = {"user.",
GF_XATTR_MDATA_KEY,
NULL};
-void gf_assert(void)
+void
+gf_assert(void)
{
if (gf_signal_on_assert) {
raise(SIGCONT);
}
-
}
void
diff --git a/libglusterfs/src/glusterfs/common-utils.h b/libglusterfs/src/glusterfs/common-utils.h
index c8014a127..6974c82f9 100644
--- a/libglusterfs/src/glusterfs/common-utils.h
+++ b/libglusterfs/src/glusterfs/common-utils.h
@@ -444,7 +444,8 @@ BIT_VALUE(unsigned char *array, unsigned int index)
} \
} while (0)
-void gf_assert(void);
+void
+gf_assert(void);
#ifdef DEBUG
#define GF_ASSERT(x) assert(x);
diff --git a/xlators/debug/io-stats/src/io-stats.c b/xlators/debug/io-stats/src/io-stats.c
index 0eac50117..a36336736 100644
--- a/xlators/debug/io-stats/src/io-stats.c
+++ b/xlators/debug/io-stats/src/io-stats.c
@@ -3765,10 +3765,10 @@ reconfigure(xlator_t *this, dict_t *options)
GF_OPTION_RECONF("ios-dump-format", dump_format_str, options, str, out);
ios_set_log_format_code(conf, dump_format_str);
if (conf->ios_sample_interval) {
- GF_OPTION_RECONF("ios-sample-buf-size", conf->ios_sample_buf_size, options,
- int32, out);
+ GF_OPTION_RECONF("ios-sample-buf-size", conf->ios_sample_buf_size,
+ options, int32, out);
} else {
- ios_sample_buf_size_configure (this->name, conf);
+ ios_sample_buf_size_configure(this->name, conf);
}
GF_OPTION_RECONF("sys-log-level", sys_log_str, options, str, out);
@@ -3951,7 +3951,7 @@ init(xlator_t *this)
GF_OPTION_INIT("ios-sample-buf-size", conf->ios_sample_buf_size, int32,
out);
} else {
- ios_sample_buf_size_configure (this->name, conf);
+ ios_sample_buf_size_configure(this->name, conf);
}
ret = ios_init_sample_buf(conf);
diff --git a/xlators/features/index/src/index.c b/xlators/features/index/src/index.c
index 72f75e09c..5eb1da164 100644
--- a/xlators/features/index/src/index.c
+++ b/xlators/features/index/src/index.c
@@ -2343,7 +2343,8 @@ index_priv_dump(xlator_t *this)
snprintf(key_prefix, GF_DUMP_MAX_BUF_LEN, "%s.%s", this->type, this->name);
gf_proc_dump_add_section("%s", key_prefix);
- gf_proc_dump_write("xattrop-pending-count", "%"PRId64, priv->pending_count);
+ gf_proc_dump_write("xattrop-pending-count", "%" PRId64,
+ priv->pending_count);
return 0;
}
diff --git a/xlators/mgmt/glusterd/src/glusterd-store.c b/xlators/mgmt/glusterd/src/glusterd-store.c
index 134307cf6..51d5099ed 100644
--- a/xlators/mgmt/glusterd/src/glusterd-store.c
+++ b/xlators/mgmt/glusterd/src/glusterd-store.c
@@ -2855,7 +2855,8 @@ glusterd_store_retrieve_bricks(glusterd_volinfo_t *volinfo)
cds_list_add_tail(&ta_brickinfo->brick_list, &volinfo->ta_bricks);
ta_brick_count++;
if (gf_store_iter_destroy(&iter)) {
- gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_STORE_ITER_DESTROY_FAIL,
+ gf_msg(this->name, GF_LOG_ERROR, 0,
+ GD_MSG_STORE_ITER_DESTROY_FAIL,
"Failed to destroy store iter");
ret = -1;
goto out;
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
index 5652b7e69..a9f7353f7 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
@@ -1460,12 +1460,10 @@ struct volopt_map_entry glusterd_volopt_map[] = {
.voltype = "performance/md-cache",
.option = "pass-through",
.op_version = GD_OP_VERSION_4_1_0},
- {
- .key = "performance.write-behind-pass-through",
- .voltype = "performance/write-behind",
- .option = "pass-through",
- .op_version = GD_OP_VERSION_9_0
- },
+ {.key = "performance.write-behind-pass-through",
+ .voltype = "performance/write-behind",
+ .option = "pass-through",
+ .op_version = GD_OP_VERSION_9_0},
{.key = "performance.md-cache-timeout",
.voltype = "performance/md-cache",
.option = "md-cache-timeout",
diff --git a/xlators/performance/write-behind/src/write-behind.c b/xlators/performance/write-behind/src/write-behind.c
index c46ffb19e..243ed511c 100644
--- a/xlators/performance/write-behind/src/write-behind.c
+++ b/xlators/performance/write-behind/src/write-behind.c
@@ -3191,15 +3191,13 @@ struct volume_options options[] = {
.op_version = {GD_OP_VERSION_6_0},
.flags = OPT_FLAG_SETTABLE,
},
- {
- .key = {"pass-through"},
- .type = GF_OPTION_TYPE_BOOL,
- .default_value = "false",
- .op_version = {GD_OP_VERSION_9_0},
- .flags = OPT_FLAG_SETTABLE | OPT_FLAG_DOC | OPT_FLAG_CLIENT_OPT,
- .tags = {"write-behind"},
- .description = "Enable/disable write-behind pass-through"
- },
+ {.key = {"pass-through"},
+ .type = GF_OPTION_TYPE_BOOL,
+ .default_value = "false",
+ .op_version = {GD_OP_VERSION_9_0},
+ .flags = OPT_FLAG_SETTABLE | OPT_FLAG_DOC | OPT_FLAG_CLIENT_OPT,
+ .tags = {"write-behind"},
+ .description = "Enable/disable write-behind pass-through"},
{.key = {"flush-behind"},
.type = GF_OPTION_TYPE_BOOL,
.default_value = "on",
CLANG-FORMAT FAILURE: Before merging the patch, this diff needs to be considered for passing clang-format
index 9c684385f..9f9d731b7 100644
--- a/libglusterfs/src/common-utils.c
+++ b/libglusterfs/src/common-utils.c
@@ -90,12 +90,12 @@ char *xattrs_to_heal[] = {"user.",
GF_XATTR_MDATA_KEY,
NULL};
-void gf_assert(void)
+void
+gf_assert(void)
{
if (gf_signal_on_assert) {
raise(SIGCONT);
}
-
}
void
diff --git a/libglusterfs/src/glusterfs/common-utils.h b/libglusterfs/src/glusterfs/common-utils.h
index c8014a127..6974c82f9 100644
--- a/libglusterfs/src/glusterfs/common-utils.h
+++ b/libglusterfs/src/glusterfs/common-utils.h
@@ -444,7 +444,8 @@ BIT_VALUE(unsigned char *array, unsigned int index)
} \
} while (0)
-void gf_assert(void);
+void
+gf_assert(void);
#ifdef DEBUG
#define GF_ASSERT(x) assert(x);
diff --git a/xlators/debug/io-stats/src/io-stats.c b/xlators/debug/io-stats/src/io-stats.c
index 0eac50117..a36336736 100644
--- a/xlators/debug/io-stats/src/io-stats.c
+++ b/xlators/debug/io-stats/src/io-stats.c
@@ -3765,10 +3765,10 @@ reconfigure(xlator_t *this, dict_t *options)
GF_OPTION_RECONF("ios-dump-format", dump_format_str, options, str, out);
ios_set_log_format_code(conf, dump_format_str);
if (conf->ios_sample_interval) {
- GF_OPTION_RECONF("ios-sample-buf-size", conf->ios_sample_buf_size, options,
- int32, out);
+ GF_OPTION_RECONF("ios-sample-buf-size", conf->ios_sample_buf_size,
+ options, int32, out);
} else {
- ios_sample_buf_size_configure (this->name, conf);
+ ios_sample_buf_size_configure(this->name, conf);
}
GF_OPTION_RECONF("sys-log-level", sys_log_str, options, str, out);
@@ -3951,7 +3951,7 @@ init(xlator_t *this)
GF_OPTION_INIT("ios-sample-buf-size", conf->ios_sample_buf_size, int32,
out);
} else {
- ios_sample_buf_size_configure (this->name, conf);
+ ios_sample_buf_size_configure(this->name, conf);
}
ret = ios_init_sample_buf(conf);
diff --git a/xlators/features/index/src/index.c b/xlators/features/index/src/index.c
index 72f75e09c..5eb1da164 100644
--- a/xlators/features/index/src/index.c
+++ b/xlators/features/index/src/index.c
@@ -2343,7 +2343,8 @@ index_priv_dump(xlator_t *this)
snprintf(key_prefix, GF_DUMP_MAX_BUF_LEN, "%s.%s", this->type, this->name);
gf_proc_dump_add_section("%s", key_prefix);
- gf_proc_dump_write("xattrop-pending-count", "%"PRId64, priv->pending_count);
+ gf_proc_dump_write("xattrop-pending-count", "%" PRId64,
+ priv->pending_count);
return 0;
}
diff --git a/xlators/mgmt/glusterd/src/glusterd-store.c b/xlators/mgmt/glusterd/src/glusterd-store.c
index 134307cf6..51d5099ed 100644
--- a/xlators/mgmt/glusterd/src/glusterd-store.c
+++ b/xlators/mgmt/glusterd/src/glusterd-store.c
@@ -2855,7 +2855,8 @@ glusterd_store_retrieve_bricks(glusterd_volinfo_t *volinfo)
cds_list_add_tail(&ta_brickinfo->brick_list, &volinfo->ta_bricks);
ta_brick_count++;
if (gf_store_iter_destroy(&iter)) {
- gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_STORE_ITER_DESTROY_FAIL,
+ gf_msg(this->name, GF_LOG_ERROR, 0,
+ GD_MSG_STORE_ITER_DESTROY_FAIL,
"Failed to destroy store iter");
ret = -1;
goto out;
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
index 5652b7e69..a9f7353f7 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
@@ -1460,12 +1460,10 @@ struct volopt_map_entry glusterd_volopt_map[] = {
.voltype = "performance/md-cache",
.option = "pass-through",
.op_version = GD_OP_VERSION_4_1_0},
- {
- .key = "performance.write-behind-pass-through",
- .voltype = "performance/write-behind",
- .option = "pass-through",
- .op_version = GD_OP_VERSION_9_0
- },
+ {.key = "performance.write-behind-pass-through",
+ .voltype = "performance/write-behind",
+ .option = "pass-through",
+ .op_version = GD_OP_VERSION_9_0},
{.key = "performance.md-cache-timeout",
.voltype = "performance/md-cache",
.option = "md-cache-timeout",
diff --git a/xlators/performance/write-behind/src/write-behind.c b/xlators/performance/write-behind/src/write-behind.c
index c46ffb19e..243ed511c 100644
--- a/xlators/performance/write-behind/src/write-behind.c
+++ b/xlators/performance/write-behind/src/write-behind.c
@@ -3191,15 +3191,13 @@ struct volume_options options[] = {
.op_version = {GD_OP_VERSION_6_0},
.flags = OPT_FLAG_SETTABLE,
},
- {
- .key = {"pass-through"},
- .type = GF_OPTION_TYPE_BOOL,
- .default_value = "false",
- .op_version = {GD_OP_VERSION_9_0},
- .flags = OPT_FLAG_SETTABLE | OPT_FLAG_DOC | OPT_FLAG_CLIENT_OPT,
- .tags = {"write-behind"},
- .description = "Enable/disable write-behind pass-through"
- },
+ {.key = {"pass-through"},
+ .type = GF_OPTION_TYPE_BOOL,
+ .default_value = "false",
+ .op_version = {GD_OP_VERSION_9_0},
+ .flags = OPT_FLAG_SETTABLE | OPT_FLAG_DOC | OPT_FLAG_CLIENT_OPT,
+ .tags = {"write-behind"},
+ .description = "Enable/disable write-behind pass-through"},
{.key = {"flush-behind"},
.type = GF_OPTION_TYPE_BOOL,
.default_value = "on",
CLANG-FORMAT FAILURE: Before merging the patch, this diff needs to be considered for passing clang-format
index 9c684385f..9f9d731b7 100644
--- a/libglusterfs/src/common-utils.c
+++ b/libglusterfs/src/common-utils.c
@@ -90,12 +90,12 @@ char *xattrs_to_heal[] = {"user.",
GF_XATTR_MDATA_KEY,
NULL};
-void gf_assert(void)
+void
+gf_assert(void)
{
if (gf_signal_on_assert) {
raise(SIGCONT);
}
-
}
void
diff --git a/libglusterfs/src/glusterfs/common-utils.h b/libglusterfs/src/glusterfs/common-utils.h
index c8014a127..6974c82f9 100644
--- a/libglusterfs/src/glusterfs/common-utils.h
+++ b/libglusterfs/src/glusterfs/common-utils.h
@@ -444,7 +444,8 @@ BIT_VALUE(unsigned char *array, unsigned int index)
} \
} while (0)
-void gf_assert(void);
+void
+gf_assert(void);
#ifdef DEBUG
#define GF_ASSERT(x) assert(x);
diff --git a/xlators/debug/io-stats/src/io-stats.c b/xlators/debug/io-stats/src/io-stats.c
index 0eac50117..a36336736 100644
--- a/xlators/debug/io-stats/src/io-stats.c
+++ b/xlators/debug/io-stats/src/io-stats.c
@@ -3765,10 +3765,10 @@ reconfigure(xlator_t *this, dict_t *options)
GF_OPTION_RECONF("ios-dump-format", dump_format_str, options, str, out);
ios_set_log_format_code(conf, dump_format_str);
if (conf->ios_sample_interval) {
- GF_OPTION_RECONF("ios-sample-buf-size", conf->ios_sample_buf_size, options,
- int32, out);
+ GF_OPTION_RECONF("ios-sample-buf-size", conf->ios_sample_buf_size,
+ options, int32, out);
} else {
- ios_sample_buf_size_configure (this->name, conf);
+ ios_sample_buf_size_configure(this->name, conf);
}
GF_OPTION_RECONF("sys-log-level", sys_log_str, options, str, out);
@@ -3951,7 +3951,7 @@ init(xlator_t *this)
GF_OPTION_INIT("ios-sample-buf-size", conf->ios_sample_buf_size, int32,
out);
} else {
- ios_sample_buf_size_configure (this->name, conf);
+ ios_sample_buf_size_configure(this->name, conf);
}
ret = ios_init_sample_buf(conf);
diff --git a/xlators/features/index/src/index.c b/xlators/features/index/src/index.c
index 72f75e09c..5eb1da164 100644
--- a/xlators/features/index/src/index.c
+++ b/xlators/features/index/src/index.c
@@ -2343,7 +2343,8 @@ index_priv_dump(xlator_t *this)
snprintf(key_prefix, GF_DUMP_MAX_BUF_LEN, "%s.%s", this->type, this->name);
gf_proc_dump_add_section("%s", key_prefix);
- gf_proc_dump_write("xattrop-pending-count", "%"PRId64, priv->pending_count);
+ gf_proc_dump_write("xattrop-pending-count", "%" PRId64,
+ priv->pending_count);
return 0;
}
diff --git a/xlators/mgmt/glusterd/src/glusterd-store.c b/xlators/mgmt/glusterd/src/glusterd-store.c
index 134307cf6..51d5099ed 100644
--- a/xlators/mgmt/glusterd/src/glusterd-store.c
+++ b/xlators/mgmt/glusterd/src/glusterd-store.c
@@ -2855,7 +2855,8 @@ glusterd_store_retrieve_bricks(glusterd_volinfo_t *volinfo)
cds_list_add_tail(&ta_brickinfo->brick_list, &volinfo->ta_bricks);
ta_brick_count++;
if (gf_store_iter_destroy(&iter)) {
- gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_STORE_ITER_DESTROY_FAIL,
+ gf_msg(this->name, GF_LOG_ERROR, 0,
+ GD_MSG_STORE_ITER_DESTROY_FAIL,
"Failed to destroy store iter");
ret = -1;
goto out;
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
index 5652b7e69..a9f7353f7 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
@@ -1460,12 +1460,10 @@ struct volopt_map_entry glusterd_volopt_map[] = {
.voltype = "performance/md-cache",
.option = "pass-through",
.op_version = GD_OP_VERSION_4_1_0},
- {
- .key = "performance.write-behind-pass-through",
- .voltype = "performance/write-behind",
- .option = "pass-through",
- .op_version = GD_OP_VERSION_9_0
- },
+ {.key = "performance.write-behind-pass-through",
+ .voltype = "performance/write-behind",
+ .option = "pass-through",
+ .op_version = GD_OP_VERSION_9_0},
{.key = "performance.md-cache-timeout",
.voltype = "performance/md-cache",
.option = "md-cache-timeout",
diff --git a/xlators/performance/write-behind/src/write-behind.c b/xlators/performance/write-behind/src/write-behind.c
index c46ffb19e..243ed511c 100644
--- a/xlators/performance/write-behind/src/write-behind.c
+++ b/xlators/performance/write-behind/src/write-behind.c
@@ -3191,15 +3191,13 @@ struct volume_options options[] = {
.op_version = {GD_OP_VERSION_6_0},
.flags = OPT_FLAG_SETTABLE,
},
- {
- .key = {"pass-through"},
- .type = GF_OPTION_TYPE_BOOL,
- .default_value = "false",
- .op_version = {GD_OP_VERSION_9_0},
- .flags = OPT_FLAG_SETTABLE | OPT_FLAG_DOC | OPT_FLAG_CLIENT_OPT,
- .tags = {"write-behind"},
- .description = "Enable/disable write-behind pass-through"
- },
+ {.key = {"pass-through"},
+ .type = GF_OPTION_TYPE_BOOL,
+ .default_value = "false",
+ .op_version = {GD_OP_VERSION_9_0},
+ .flags = OPT_FLAG_SETTABLE | OPT_FLAG_DOC | OPT_FLAG_CLIENT_OPT,
+ .tags = {"write-behind"},
+ .description = "Enable/disable write-behind pass-through"},
{.key = {"flush-behind"},
.type = GF_OPTION_TYPE_BOOL,
.default_value = "on",
CLANG-FORMAT FAILURE: Before merging the patch, this diff needs to be considered for passing clang-format
index 9c684385f..9f9d731b7 100644
--- a/libglusterfs/src/common-utils.c
+++ b/libglusterfs/src/common-utils.c
@@ -90,12 +90,12 @@ char *xattrs_to_heal[] = {"user.",
GF_XATTR_MDATA_KEY,
NULL};
-void gf_assert(void)
+void
+gf_assert(void)
{
if (gf_signal_on_assert) {
raise(SIGCONT);
}
-
}
void
diff --git a/libglusterfs/src/glusterfs/common-utils.h b/libglusterfs/src/glusterfs/common-utils.h
index c8014a127..6974c82f9 100644
--- a/libglusterfs/src/glusterfs/common-utils.h
+++ b/libglusterfs/src/glusterfs/common-utils.h
@@ -444,7 +444,8 @@ BIT_VALUE(unsigned char *array, unsigned int index)
} \
} while (0)
-void gf_assert(void);
+void
+gf_assert(void);
#ifdef DEBUG
#define GF_ASSERT(x) assert(x);
diff --git a/xlators/debug/io-stats/src/io-stats.c b/xlators/debug/io-stats/src/io-stats.c
index 0eac50117..a36336736 100644
--- a/xlators/debug/io-stats/src/io-stats.c
+++ b/xlators/debug/io-stats/src/io-stats.c
@@ -3765,10 +3765,10 @@ reconfigure(xlator_t *this, dict_t *options)
GF_OPTION_RECONF("ios-dump-format", dump_format_str, options, str, out);
ios_set_log_format_code(conf, dump_format_str);
if (conf->ios_sample_interval) {
- GF_OPTION_RECONF("ios-sample-buf-size", conf->ios_sample_buf_size, options,
- int32, out);
+ GF_OPTION_RECONF("ios-sample-buf-size", conf->ios_sample_buf_size,
+ options, int32, out);
} else {
- ios_sample_buf_size_configure (this->name, conf);
+ ios_sample_buf_size_configure(this->name, conf);
}
GF_OPTION_RECONF("sys-log-level", sys_log_str, options, str, out);
@@ -3951,7 +3951,7 @@ init(xlator_t *this)
GF_OPTION_INIT("ios-sample-buf-size", conf->ios_sample_buf_size, int32,
out);
} else {
- ios_sample_buf_size_configure (this->name, conf);
+ ios_sample_buf_size_configure(this->name, conf);
}
ret = ios_init_sample_buf(conf);
diff --git a/xlators/features/index/src/index.c b/xlators/features/index/src/index.c
index 72f75e09c..5eb1da164 100644
--- a/xlators/features/index/src/index.c
+++ b/xlators/features/index/src/index.c
@@ -2343,7 +2343,8 @@ index_priv_dump(xlator_t *this)
snprintf(key_prefix, GF_DUMP_MAX_BUF_LEN, "%s.%s", this->type, this->name);
gf_proc_dump_add_section("%s", key_prefix);
- gf_proc_dump_write("xattrop-pending-count", "%"PRId64, priv->pending_count);
+ gf_proc_dump_write("xattrop-pending-count", "%" PRId64,
+ priv->pending_count);
return 0;
}
diff --git a/xlators/mgmt/glusterd/src/glusterd-store.c b/xlators/mgmt/glusterd/src/glusterd-store.c
index 134307cf6..51d5099ed 100644
--- a/xlators/mgmt/glusterd/src/glusterd-store.c
+++ b/xlators/mgmt/glusterd/src/glusterd-store.c
@@ -2855,7 +2855,8 @@ glusterd_store_retrieve_bricks(glusterd_volinfo_t *volinfo)
cds_list_add_tail(&ta_brickinfo->brick_list, &volinfo->ta_bricks);
ta_brick_count++;
if (gf_store_iter_destroy(&iter)) {
- gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_STORE_ITER_DESTROY_FAIL,
+ gf_msg(this->name, GF_LOG_ERROR, 0,
+ GD_MSG_STORE_ITER_DESTROY_FAIL,
"Failed to destroy store iter");
ret = -1;
goto out;
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
index 5652b7e69..a9f7353f7 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
@@ -1460,12 +1460,10 @@ struct volopt_map_entry glusterd_volopt_map[] = {
.voltype = "performance/md-cache",
.option = "pass-through",
.op_version = GD_OP_VERSION_4_1_0},
- {
- .key = "performance.write-behind-pass-through",
- .voltype = "performance/write-behind",
- .option = "pass-through",
- .op_version = GD_OP_VERSION_9_0
- },
+ {.key = "performance.write-behind-pass-through",
+ .voltype = "performance/write-behind",
+ .option = "pass-through",
+ .op_version = GD_OP_VERSION_9_0},
{.key = "performance.md-cache-timeout",
.voltype = "performance/md-cache",
.option = "md-cache-timeout",
diff --git a/xlators/performance/write-behind/src/write-behind.c b/xlators/performance/write-behind/src/write-behind.c
index c46ffb19e..243ed511c 100644
--- a/xlators/performance/write-behind/src/write-behind.c
+++ b/xlators/performance/write-behind/src/write-behind.c
@@ -3191,15 +3191,13 @@ struct volume_options options[] = {
.op_version = {GD_OP_VERSION_6_0},
.flags = OPT_FLAG_SETTABLE,
},
- {
- .key = {"pass-through"},
- .type = GF_OPTION_TYPE_BOOL,
- .default_value = "false",
- .op_version = {GD_OP_VERSION_9_0},
- .flags = OPT_FLAG_SETTABLE | OPT_FLAG_DOC | OPT_FLAG_CLIENT_OPT,
- .tags = {"write-behind"},
- .description = "Enable/disable write-behind pass-through"
- },
+ {.key = {"pass-through"},
+ .type = GF_OPTION_TYPE_BOOL,
+ .default_value = "false",
+ .op_version = {GD_OP_VERSION_9_0},
+ .flags = OPT_FLAG_SETTABLE | OPT_FLAG_DOC | OPT_FLAG_CLIENT_OPT,
+ .tags = {"write-behind"},
+ .description = "Enable/disable write-behind pass-through"},
{.key = {"flush-behind"},
.type = GF_OPTION_TYPE_BOOL,
.default_value = "on",
CLANG-FORMAT FAILURE: Before merging the patch, this diff needs to be considered for passing clang-format
index 9c684385f..9f9d731b7 100644
--- a/libglusterfs/src/common-utils.c
+++ b/libglusterfs/src/common-utils.c
@@ -90,12 +90,12 @@ char *xattrs_to_heal[] = {"user.",
GF_XATTR_MDATA_KEY,
NULL};
-void gf_assert(void)
+void
+gf_assert(void)
{
if (gf_signal_on_assert) {
raise(SIGCONT);
}
-
}
void
diff --git a/libglusterfs/src/glusterfs/common-utils.h b/libglusterfs/src/glusterfs/common-utils.h
index c8014a127..6974c82f9 100644
--- a/libglusterfs/src/glusterfs/common-utils.h
+++ b/libglusterfs/src/glusterfs/common-utils.h
@@ -444,7 +444,8 @@ BIT_VALUE(unsigned char *array, unsigned int index)
} \
} while (0)
-void gf_assert(void);
+void
+gf_assert(void);
#ifdef DEBUG
#define GF_ASSERT(x) assert(x);
diff --git a/xlators/debug/io-stats/src/io-stats.c b/xlators/debug/io-stats/src/io-stats.c
index 0eac50117..a36336736 100644
--- a/xlators/debug/io-stats/src/io-stats.c
+++ b/xlators/debug/io-stats/src/io-stats.c
@@ -3765,10 +3765,10 @@ reconfigure(xlator_t *this, dict_t *options)
GF_OPTION_RECONF("ios-dump-format", dump_format_str, options, str, out);
ios_set_log_format_code(conf, dump_format_str);
if (conf->ios_sample_interval) {
- GF_OPTION_RECONF("ios-sample-buf-size", conf->ios_sample_buf_size, options,
- int32, out);
+ GF_OPTION_RECONF("ios-sample-buf-size", conf->ios_sample_buf_size,
+ options, int32, out);
} else {
- ios_sample_buf_size_configure (this->name, conf);
+ ios_sample_buf_size_configure(this->name, conf);
}
GF_OPTION_RECONF("sys-log-level", sys_log_str, options, str, out);
@@ -3951,7 +3951,7 @@ init(xlator_t *this)
GF_OPTION_INIT("ios-sample-buf-size", conf->ios_sample_buf_size, int32,
out);
} else {
- ios_sample_buf_size_configure (this->name, conf);
+ ios_sample_buf_size_configure(this->name, conf);
}
ret = ios_init_sample_buf(conf);
diff --git a/xlators/features/index/src/index.c b/xlators/features/index/src/index.c
index 72f75e09c..5eb1da164 100644
--- a/xlators/features/index/src/index.c
+++ b/xlators/features/index/src/index.c
@@ -2343,7 +2343,8 @@ index_priv_dump(xlator_t *this)
snprintf(key_prefix, GF_DUMP_MAX_BUF_LEN, "%s.%s", this->type, this->name);
gf_proc_dump_add_section("%s", key_prefix);
- gf_proc_dump_write("xattrop-pending-count", "%"PRId64, priv->pending_count);
+ gf_proc_dump_write("xattrop-pending-count", "%" PRId64,
+ priv->pending_count);
return 0;
}
diff --git a/xlators/mgmt/glusterd/src/glusterd-store.c b/xlators/mgmt/glusterd/src/glusterd-store.c
index 134307cf6..51d5099ed 100644
--- a/xlators/mgmt/glusterd/src/glusterd-store.c
+++ b/xlators/mgmt/glusterd/src/glusterd-store.c
@@ -2855,7 +2855,8 @@ glusterd_store_retrieve_bricks(glusterd_volinfo_t *volinfo)
cds_list_add_tail(&ta_brickinfo->brick_list, &volinfo->ta_bricks);
ta_brick_count++;
if (gf_store_iter_destroy(&iter)) {
- gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_STORE_ITER_DESTROY_FAIL,
+ gf_msg(this->name, GF_LOG_ERROR, 0,
+ GD_MSG_STORE_ITER_DESTROY_FAIL,
"Failed to destroy store iter");
ret = -1;
goto out;
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
index 5652b7e69..a9f7353f7 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
@@ -1460,12 +1460,10 @@ struct volopt_map_entry glusterd_volopt_map[] = {
.voltype = "performance/md-cache",
.option = "pass-through",
.op_version = GD_OP_VERSION_4_1_0},
- {
- .key = "performance.write-behind-pass-through",
- .voltype = "performance/write-behind",
- .option = "pass-through",
- .op_version = GD_OP_VERSION_9_0
- },
+ {.key = "performance.write-behind-pass-through",
+ .voltype = "performance/write-behind",
+ .option = "pass-through",
+ .op_version = GD_OP_VERSION_9_0},
{.key = "performance.md-cache-timeout",
.voltype = "performance/md-cache",
.option = "md-cache-timeout",
diff --git a/xlators/performance/write-behind/src/write-behind.c b/xlators/performance/write-behind/src/write-behind.c
index c46ffb19e..243ed511c 100644
--- a/xlators/performance/write-behind/src/write-behind.c
+++ b/xlators/performance/write-behind/src/write-behind.c
@@ -3191,15 +3191,13 @@ struct volume_options options[] = {
.op_version = {GD_OP_VERSION_6_0},
.flags = OPT_FLAG_SETTABLE,
},
- {
- .key = {"pass-through"},
- .type = GF_OPTION_TYPE_BOOL,
- .default_value = "false",
- .op_version = {GD_OP_VERSION_9_0},
- .flags = OPT_FLAG_SETTABLE | OPT_FLAG_DOC | OPT_FLAG_CLIENT_OPT,
- .tags = {"write-behind"},
- .description = "Enable/disable write-behind pass-through"
- },
+ {.key = {"pass-through"},
+ .type = GF_OPTION_TYPE_BOOL,
+ .default_value = "false",
+ .op_version = {GD_OP_VERSION_9_0},
+ .flags = OPT_FLAG_SETTABLE | OPT_FLAG_DOC | OPT_FLAG_CLIENT_OPT,
+ .tags = {"write-behind"},
+ .description = "Enable/disable write-behind pass-through"},
{.key = {"flush-behind"},
.type = GF_OPTION_TYPE_BOOL,
.default_value = "on",
CLANG-FORMAT FAILURE: Before merging the patch, this diff needs to be considered for passing clang-format
index 9c684385f..9f9d731b7 100644
--- a/libglusterfs/src/common-utils.c
+++ b/libglusterfs/src/common-utils.c
@@ -90,12 +90,12 @@ char *xattrs_to_heal[] = {"user.",
GF_XATTR_MDATA_KEY,
NULL};
-void gf_assert(void)
+void
+gf_assert(void)
{
if (gf_signal_on_assert) {
raise(SIGCONT);
}
-
}
void
diff --git a/libglusterfs/src/glusterfs/common-utils.h b/libglusterfs/src/glusterfs/common-utils.h
index c8014a127..6974c82f9 100644
--- a/libglusterfs/src/glusterfs/common-utils.h
+++ b/libglusterfs/src/glusterfs/common-utils.h
@@ -444,7 +444,8 @@ BIT_VALUE(unsigned char *array, unsigned int index)
} \
} while (0)
-void gf_assert(void);
+void
+gf_assert(void);
#ifdef DEBUG
#define GF_ASSERT(x) assert(x);
diff --git a/xlators/debug/io-stats/src/io-stats.c b/xlators/debug/io-stats/src/io-stats.c
index 0eac50117..a36336736 100644
--- a/xlators/debug/io-stats/src/io-stats.c
+++ b/xlators/debug/io-stats/src/io-stats.c
@@ -3765,10 +3765,10 @@ reconfigure(xlator_t *this, dict_t *options)
GF_OPTION_RECONF("ios-dump-format", dump_format_str, options, str, out);
ios_set_log_format_code(conf, dump_format_str);
if (conf->ios_sample_interval) {
- GF_OPTION_RECONF("ios-sample-buf-size", conf->ios_sample_buf_size, options,
- int32, out);
+ GF_OPTION_RECONF("ios-sample-buf-size", conf->ios_sample_buf_size,
+ options, int32, out);
} else {
- ios_sample_buf_size_configure (this->name, conf);
+ ios_sample_buf_size_configure(this->name, conf);
}
GF_OPTION_RECONF("sys-log-level", sys_log_str, options, str, out);
@@ -3951,7 +3951,7 @@ init(xlator_t *this)
GF_OPTION_INIT("ios-sample-buf-size", conf->ios_sample_buf_size, int32,
out);
} else {
- ios_sample_buf_size_configure (this->name, conf);
+ ios_sample_buf_size_configure(this->name, conf);
}
ret = ios_init_sample_buf(conf);
diff --git a/xlators/features/index/src/index.c b/xlators/features/index/src/index.c
index 72f75e09c..5eb1da164 100644
--- a/xlators/features/index/src/index.c
+++ b/xlators/features/index/src/index.c
@@ -2343,7 +2343,8 @@ index_priv_dump(xlator_t *this)
snprintf(key_prefix, GF_DUMP_MAX_BUF_LEN, "%s.%s", this->type, this->name);
gf_proc_dump_add_section("%s", key_prefix);
- gf_proc_dump_write("xattrop-pending-count", "%"PRId64, priv->pending_count);
+ gf_proc_dump_write("xattrop-pending-count", "%" PRId64,
+ priv->pending_count);
return 0;
}
diff --git a/xlators/mgmt/glusterd/src/glusterd-store.c b/xlators/mgmt/glusterd/src/glusterd-store.c
index 134307cf6..51d5099ed 100644
--- a/xlators/mgmt/glusterd/src/glusterd-store.c
+++ b/xlators/mgmt/glusterd/src/glusterd-store.c
@@ -2855,7 +2855,8 @@ glusterd_store_retrieve_bricks(glusterd_volinfo_t *volinfo)
cds_list_add_tail(&ta_brickinfo->brick_list, &volinfo->ta_bricks);
ta_brick_count++;
if (gf_store_iter_destroy(&iter)) {
- gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_STORE_ITER_DESTROY_FAIL,
+ gf_msg(this->name, GF_LOG_ERROR, 0,
+ GD_MSG_STORE_ITER_DESTROY_FAIL,
"Failed to destroy store iter");
ret = -1;
goto out;
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
index 5652b7e69..a9f7353f7 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
@@ -1460,12 +1460,10 @@ struct volopt_map_entry glusterd_volopt_map[] = {
.voltype = "performance/md-cache",
.option = "pass-through",
.op_version = GD_OP_VERSION_4_1_0},
- {
- .key = "performance.write-behind-pass-through",
- .voltype = "performance/write-behind",
- .option = "pass-through",
- .op_version = GD_OP_VERSION_9_0
- },
+ {.key = "performance.write-behind-pass-through",
+ .voltype = "performance/write-behind",
+ .option = "pass-through",
+ .op_version = GD_OP_VERSION_9_0},
{.key = "performance.md-cache-timeout",
.voltype = "performance/md-cache",
.option = "md-cache-timeout",
diff --git a/xlators/performance/write-behind/src/write-behind.c b/xlators/performance/write-behind/src/write-behind.c
index c46ffb19e..243ed511c 100644
--- a/xlators/performance/write-behind/src/write-behind.c
+++ b/xlators/performance/write-behind/src/write-behind.c
@@ -3191,15 +3191,13 @@ struct volume_options options[] = {
.op_version = {GD_OP_VERSION_6_0},
.flags = OPT_FLAG_SETTABLE,
},
- {
- .key = {"pass-through"},
- .type = GF_OPTION_TYPE_BOOL,
- .default_value = "false",
- .op_version = {GD_OP_VERSION_9_0},
- .flags = OPT_FLAG_SETTABLE | OPT_FLAG_DOC | OPT_FLAG_CLIENT_OPT,
- .tags = {"write-behind"},
- .description = "Enable/disable write-behind pass-through"
- },
+ {.key = {"pass-through"},
+ .type = GF_OPTION_TYPE_BOOL,
+ .default_value = "false",
+ .op_version = {GD_OP_VERSION_9_0},
+ .flags = OPT_FLAG_SETTABLE | OPT_FLAG_DOC | OPT_FLAG_CLIENT_OPT,
+ .tags = {"write-behind"},
+ .description = "Enable/disable write-behind pass-through"},
{.key = {"flush-behind"},
.type = GF_OPTION_TYPE_BOOL,
.default_value = "on",