staging: lustre: Delete unnecessary goto statements in six functions

Six goto statements referred to a source code position
directly behind them.
Thus omit such unnecessary jumps.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/lustre/llite/namei.c b/drivers/staging/lustre/lustre/llite/namei.c
index 14370b97fe5c956a215b8f290d7d9895f5e90769..8d8220f3db83f95beca05ff5f9ffe17d799faf36 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/namei.c
+++ b/drivers/staging/lustre/lustre/llite/namei.c
@@ -556,7 +556,6 @@ static struct dentry *ll_lookup_it(struct inode *parent, struct dentry *dentry,
                retval = NULL;
        else
                retval = dentry;
-       goto out;
  out:
        if (req)
                ptlrpc_req_finished(req);

diff --git a/drivers/staging/lustre/lustre/mdc/mdc_request.c b/drivers/staging/lustre/lustre/mdc/mdc_request.c
index 8baf726a983fa46567b3c5d9b9a7b0e4bac096eb..57e0fc1e8549d9e7ff4d7fe0a52481a05f2b31c2 100644 (file)
--- a/drivers/staging/lustre/lustre/mdc/mdc_request.c
+++ b/drivers/staging/lustre/lustre/mdc/mdc_request.c
@@ -1181,7 +1181,6 @@ static int mdc_ioc_hsm_progress(struct obd_export *exp,
        ptlrpc_request_set_replen(req);
 
        rc = mdc_queue_wait(req);
-       goto out;
 out:
        ptlrpc_req_finished(req);
        return rc;
@@ -1216,7 +1215,6 @@ static int mdc_ioc_hsm_ct_register(struct obd_import *imp, __u32 archives)
        ptlrpc_request_set_replen(req);
 
        rc = mdc_queue_wait(req);
-       goto out;
 out:
        ptlrpc_req_finished(req);
        return rc;
@@ -1282,7 +1280,6 @@ static int mdc_ioc_hsm_ct_unregister(struct obd_import *imp)
        ptlrpc_request_set_replen(req);
 
        rc = mdc_queue_wait(req);
-       goto out;
 out:
        ptlrpc_req_finished(req);
        return rc;
@@ -1362,8 +1359,6 @@ static int mdc_ioc_hsm_state_set(struct obd_export *exp,
        ptlrpc_request_set_replen(req);
 
        rc = mdc_queue_wait(req);
-       goto out;
-
 out:
        ptlrpc_req_finished(req);
        return rc;
@@ -1427,8 +1422,6 @@ static int mdc_ioc_hsm_request(struct obd_export *exp,
        ptlrpc_request_set_replen(req);
 
        rc = mdc_queue_wait(req);
-       goto out;
-
 out:
        ptlrpc_req_finished(req);
        return rc;