Looks good, thanks.
Ethan
On Tue, Apr 17, 2012 at 17:23, Ben Pfaff <b...@nicira.com> wrote:
> It's only used in cmd_get_fail_mode(), which can easily look it up for
> itself, so there's no benefit to storing it in every vsctl_bridge record.
>
> Signed-off-by: Ben Pfaff <b...@nicira.com>
> ---
> utilities/ovs-vsctl.c | 16 +++++++++-------
> 1 files changed, 9 insertions(+), 7 deletions(-)
>
> diff --git a/utilities/ovs-vsctl.c b/utilities/ovs-vsctl.c
> index 08e18a5..f75d7a8 100644
> --- a/utilities/ovs-vsctl.c
> +++ b/utilities/ovs-vsctl.c
> @@ -630,7 +630,6 @@ struct vsctl_bridge {
> struct ovsrec_bridge *br_cfg;
> char *name;
> struct ovsrec_controller **ctrl;
> - char *fail_mode;
> size_t n_ctrl;
>
> /* VLAN ("fake") bridge support.
> @@ -707,11 +706,9 @@ add_bridge(struct vsctl_context *ctx,
> if (parent) {
> br->ctrl = parent->br_cfg->controller;
> br->n_ctrl = parent->br_cfg->n_controller;
> - br->fail_mode = parent->br_cfg->fail_mode;
> } else {
> br->ctrl = br_cfg->controller;
> br->n_ctrl = br_cfg->n_controller;
> - br->fail_mode = br_cfg->fail_mode;
> }
> shash_add(&ctx->bridges, br->name, br);
> return br;
> @@ -2061,14 +2058,19 @@ static void
> cmd_get_fail_mode(struct vsctl_context *ctx)
> {
> struct vsctl_bridge *br;
> + const char *fail_mode;
>
> vsctl_context_populate_cache(ctx);
> br = find_bridge(ctx, ctx->argv[1], true);
>
> - ovsrec_bridge_verify_fail_mode(br->br_cfg
> - ? br->br_cfg : br->parent->br_cfg);
> - if (br->fail_mode && strlen(br->fail_mode)) {
> - ds_put_format(&ctx->output, "%s\n", br->fail_mode);
> + if (br->parent) {
> + br = br->parent;
> + }
> + ovsrec_bridge_verify_fail_mode(br->br_cfg);
> +
> + fail_mode = br->br_cfg->fail_mode;
> + if (fail_mode && strlen(fail_mode)) {
> + ds_put_format(&ctx->output, "%s\n", fail_mode);
> }
> }
>
> --
> 1.7.2.5
>
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> http://openvswitch.org/mailman/listinfo/dev
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
