staging: lustre: obdclass: expand the GOTO macro + break

The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@@
identifier lbl,rc,f;
constant c;
@@

- GOTO(lbl,\(rc\|rc->f\|c\));
- break;
+ goto lbl;

@@
identifier lbl;
expression rc;
@@

- GOTO(lbl,rc);
- break;
+ rc;
+ goto lbl;
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/lustre/obdclass/obd_config.c b/drivers/staging/lustre/lustre/obdclass/obd_config.c
index f41695df4015246e4ec628c199d97a997425e2d1..8a9752ffe110b72935b61d4e565811638db38b2a 100644 (file)
--- a/drivers/staging/lustre/lustre/obdclass/obd_config.c
+++ b/drivers/staging/lustre/lustre/obdclass/obd_config.c
@@ -1226,25 +1226,25 @@ int class_process_config(struct lustre_cfg *lcfg)
        }
        case LCFG_POOL_NEW: {
                err = obd_pool_new(obd, lustre_cfg_string(lcfg, 2));
-               GOTO(out, err = 0);
-               break;
+               err = 0;
+               goto out;
        }
        case LCFG_POOL_ADD: {
                err = obd_pool_add(obd, lustre_cfg_string(lcfg, 2),
                                   lustre_cfg_string(lcfg, 3));
-               GOTO(out, err = 0);
-               break;
+               err = 0;
+               goto out;
        }
        case LCFG_POOL_REM: {
                err = obd_pool_rem(obd, lustre_cfg_string(lcfg, 2),
                                   lustre_cfg_string(lcfg, 3));
-               GOTO(out, err = 0);
-               break;
+               err = 0;
+               goto out;
        }
        case LCFG_POOL_DEL: {
                err = obd_pool_del(obd, lustre_cfg_string(lcfg, 2));
-               GOTO(out, err = 0);
-               break;
+               err = 0;
+               goto out;
        }
        default: {
                err = obd_process_config(obd, sizeof(*lcfg), lcfg);