diff options
author | Julia Lawall <Julia.Lawall@lip6.fr> | 2014-09-07 18:18:33 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-08 12:46:32 -0700 |
commit | 09c8a87ce62e858a048ca958faffc16acacfbc4e (patch) | |
tree | ff9de3313d676a467417328933da89f1c3b862e1 /drivers/staging/lustre/lustre/obdclass | |
parent | a8e147da484b996e3d649059607c6707a612aad6 (diff) |
staging: lustre: obdclass: expand double GOTO macros
The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
@@
identifier lbl;
@@
if (...)
GOTO(lbl,...);
+else
GOTO(lbl,...);
@@
identifier lbl;
expression e,e1,e2;
@@
if (e)
- GOTO(lbl,e1);
-else GOTO(lbl,e2);
+ e1;
+else e2;
+goto lbl;
@@
identifier lbl1,lbl2;
expression e,e1,e2;
@@
+ e1=e2;
if (e)
- GOTO(lbl1,e1=e2);
-GOTO(lbl2,e1=e2);
+ goto lbl1;
+goto lbl2;
// </smpl>
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/lustre/lustre/obdclass')
-rw-r--r-- | drivers/staging/lustre/lustre/obdclass/dt_object.c | 6 | ||||
-rw-r--r-- | drivers/staging/lustre/lustre/obdclass/llog.c | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/drivers/staging/lustre/lustre/obdclass/dt_object.c b/drivers/staging/lustre/lustre/obdclass/dt_object.c index 130b8dd0b418..4060173412e2 100644 --- a/drivers/staging/lustre/lustre/obdclass/dt_object.c +++ b/drivers/staging/lustre/lustre/obdclass/dt_object.c @@ -689,8 +689,10 @@ static int dt_index_page_build(const struct lu_env *env, union lu_page *lp, if (nob < size) { if (lip->lip_nr == 0) - GOTO(out, rc = -EINVAL); - GOTO(out, rc = 0); + rc = -EINVAL; + else + rc = 0; + goto out; } if ((ii->ii_flags & II_FL_NOHASH) == 0) { diff --git a/drivers/staging/lustre/lustre/obdclass/llog.c b/drivers/staging/lustre/lustre/obdclass/llog.c index ebdc42f33952..1cf604d4860d 100644 --- a/drivers/staging/lustre/lustre/obdclass/llog.c +++ b/drivers/staging/lustre/lustre/obdclass/llog.c @@ -336,9 +336,10 @@ repeat: if (rec->lrh_index == 0) { /* probably another rec just got added? */ + rc = 0; if (index <= loghandle->lgh_last_idx) - GOTO(repeat, rc = 0); - GOTO(out, rc = 0); /* no more records */ + goto repeat; + goto out; /* no more records */ } if (rec->lrh_len == 0 || rec->lrh_len > LLOG_CHUNK_SIZE) { |