staging: lustre: libcfs: 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/libcfs/module.c b/drivers/staging/lustre/lustre/libcfs/module.c
index 8267aa9ce222b6b9272a0fe27ca4d6fb4a36f247..2c4fc74505bcede6f53f28bb30e2cac934f532c8 100644 (file)
--- a/drivers/staging/lustre/lustre/libcfs/module.c
+++ b/drivers/staging/lustre/lustre/libcfs/module.c
@@ -301,7 +301,8 @@ static int libcfs_ioctl(struct cfs_psdev_file *pfile, unsigned long cmd, void *a
        /* 'cmd' and permissions get checked in our arch-specific caller */
        if (libcfs_ioctl_getdata(buf, buf + 800, (void *)arg)) {
                CERROR("PORTALS ioctl: data error\n");
-               GOTO(out, err = -EINVAL);
+               err = -EINVAL;
+               goto out;
        }
        data = (struct libcfs_ioctl_data *)buf;
 

diff --git a/drivers/staging/lustre/lustre/libcfs/upcall_cache.c b/drivers/staging/lustre/lustre/libcfs/upcall_cache.c
index 0e955886b99086f958c904a92bb9b04dab0e968c..f5e08caa6fc0ca7b6bd85a882477d3932d15d645 100644 (file)
--- a/drivers/staging/lustre/lustre/libcfs/upcall_cache.c
+++ b/drivers/staging/lustre/lustre/libcfs/upcall_cache.c
@@ -205,7 +205,8 @@ find_again:
                        wake_up_all(&entry->ue_waitq);
                        if (unlikely(rc == -EREMCHG)) {
                                put_entry(cache, entry);
-                               GOTO(out, entry = ERR_PTR(rc));
+                               entry = ERR_PTR(rc);
+                               goto out;
                        }
                }
        }
@@ -232,14 +233,16 @@ find_again:
                        CERROR("acquire for key %llu: error %d\n",
                               entry->ue_key, rc);
                        put_entry(cache, entry);
-                       GOTO(out, entry = ERR_PTR(rc));
+                       entry = ERR_PTR(rc);
+                       goto out;
                }
        }
 
        /* invalid means error, don't need to try again */
        if (UC_CACHE_IS_INVALID(entry)) {
                put_entry(cache, entry);
-               GOTO(out, entry = ERR_PTR(-EIDRM));
+               entry = ERR_PTR(-EIDRM);
+               goto out;
        }
 
        /* check expired
@@ -312,19 +315,22 @@ int upcall_cache_downcall(struct upcall_cache *cache, __u32 err, __u64 key,
        if (err) {
                CDEBUG(D_OTHER, "%s: upcall for key %llu returned %d\n",
                       cache->uc_name, entry->ue_key, err);
-               GOTO(out, rc = -EINVAL);
+               rc = -EINVAL;
+               goto out;
        }
 
        if (!UC_CACHE_IS_ACQUIRING(entry)) {
                CDEBUG(D_RPCTRACE, "%s: found uptodate entry %p (key %llu)\n",
                       cache->uc_name, entry, entry->ue_key);
-               GOTO(out, rc = 0);
+               rc = 0;
+               goto out;
        }
 
        if (UC_CACHE_IS_INVALID(entry) || UC_CACHE_IS_EXPIRED(entry)) {
                CERROR("%s: found a stale entry %p (key %llu) in ioctl\n",
                       cache->uc_name, entry, entry->ue_key);
-               GOTO(out, rc = -EINVAL);
+               rc = -EINVAL;
+               goto out;
        }
 
        spin_unlock(&cache->uc_lock);
@@ -332,7 +338,7 @@ int upcall_cache_downcall(struct upcall_cache *cache, __u32 err, __u64 key,
                rc = cache->uc_ops->parse_downcall(cache, entry, args);
        spin_lock(&cache->uc_lock);
        if (rc)
-               GOTO(out, rc);
+               goto out;
 
        entry->ue_expire = cfs_time_shift(cache->uc_entry_expire);
        UC_CACHE_SET_VALID(entry);