[PATCH v2] Staging: lustre: lustre: fid: Remove unnecessary else after return

[PATCH v2] Staging: lustre: lustre: fid: Remove unnecessary else after return

[aybuke ozdemir]

This patch fixes "else is not generally useful after
a break or return" checkpatch.pl warning using goto statement in fid_request.c

Signed-off-by: aybuke ozdemir <aybuke.147@gmail.com>
---
Changes since v1:
* removed the "else" block instead of goto statement was used and
a commit message has been corrected.
---
 drivers/staging/lustre/lustre/fid/fid_request.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/lustre/lustre/fid/fid_request.c b/drivers/staging/lustre/lustre/fid/fid_request.c
index 063441a..a3a300e 100644
--- a/drivers/staging/lustre/lustre/fid/fid_request.c
+++ b/drivers/staging/lustre/lustre/fid/fid_request.c
@@ -200,7 +200,7 @@ static int seq_client_alloc_seq(const struct lu_env *env,
 		if (rc) {
 			CERROR("%s: Can't allocate new meta-sequence, rc %d\n",
 			       seq->lcs_name, rc);
-			return rc;
+			goto out;
 		} else {
 			CDEBUG(D_INFO, "%s: New range - "DRANGE"\n",
 			       seq->lcs_name, PRANGE(&seq->lcs_space));
@@ -215,7 +215,7 @@ static int seq_client_alloc_seq(const struct lu_env *env,
 
 	CDEBUG(D_INFO, "%s: Allocated sequence [%#llx]\n", seq->lcs_name,
 	       *seqnr);
-
+out:
 	return rc;
 }
 
-- 
1.9.1

Re: [Outreachy kernel] [PATCH v2] Staging: lustre: lustre: fid: Remove unnecessary else after return

[Greg KH]

On Fri, Feb 20, 2015 at 09:38:59PM +0200, aybuke ozdemir wrote:
> This patch fixes "else is not generally useful after
> a break or return" checkpatch.pl warning using goto statement in fid_request.c
> 
> Signed-off-by: aybuke ozdemir <aybuke.147@gmail.com>
> ---
> Changes since v1:
> * removed the "else" block instead of goto statement was used and
> a commit message has been corrected.
> ---
>  drivers/staging/lustre/lustre/fid/fid_request.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/staging/lustre/lustre/fid/fid_request.c b/drivers/staging/lustre/lustre/fid/fid_request.c
> index 063441a..a3a300e 100644
> --- a/drivers/staging/lustre/lustre/fid/fid_request.c
> +++ b/drivers/staging/lustre/lustre/fid/fid_request.c
> @@ -200,7 +200,7 @@ static int seq_client_alloc_seq(const struct lu_env *env,
>  		if (rc) {
>  			CERROR("%s: Can't allocate new meta-sequence, rc %d\n",
>  			       seq->lcs_name, rc);
> -			return rc;
> +			goto out;

No need for this, just remove the else line below here instead.

>  		} else {
>  			CDEBUG(D_INFO, "%s: New range - "DRANGE"\n",
>  			       seq->lcs_name, PRANGE(&seq->lcs_space));

thanks,

greg k-h