staging: lustre: lvfs: expand the GOTO macro

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

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

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

@@
identifier lbl;
expression rc;
@@

- GOTO(lbl,rc);
+ 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/lvfs/lvfs_linux.c b/drivers/staging/lustre/lustre/lvfs/lvfs_linux.c
index eea0b2c94ba940ffff5357d5ad1c3f4263cac96c..d9209b9aef492347d89127d8153f2337241fec8b 100644 (file)
--- a/drivers/staging/lustre/lustre/lvfs/lvfs_linux.c
+++ b/drivers/staging/lustre/lustre/lvfs/lvfs_linux.c
@@ -215,12 +215,16 @@ int lustre_rename(struct dentry *dir, struct vfsmount *mnt,
        if (IS_ERR(dchild_old))
                return PTR_ERR(dchild_old);
 
-       if (!dchild_old->d_inode)
-               GOTO(put_old, err = -ENOENT);
+       if (!dchild_old->d_inode) {
+               err = -ENOENT;
+               goto put_old;
+       }
 
        dchild_new = ll_lookup_one_len(newname, dir, strlen(newname));
-       if (IS_ERR(dchild_new))
-               GOTO(put_old, err = PTR_ERR(dchild_new));
+       if (IS_ERR(dchild_new)) {
+               err = PTR_ERR(dchild_new);
+               goto put_old;
+       }
 
        err = ll_vfs_rename(dir->d_inode, dchild_old, mnt,
                            dir->d_inode, dchild_new, mnt);