Re: [Outreachy kernel] [PATCH 4/5] Staging: lustre: lustre: ldlm: Remove unnecessary else after return

[Greg KH <gregkh@linuxfoundation.org>]

On Sat, Feb 28, 2015 at 10:23:05PM +0300, Haneen Mohammed wrote:
> This patch fix else is not usefull after break or return.
> Issue addressed by checkpatch.pl
> 
> Signed-off-by: Haneen Mohammed <hamohammed.sa@gmail.com>
> ---
>  drivers/staging/lustre/lustre/ldlm/ldlm_lib.c   |  4 ++--
>  drivers/staging/lustre/lustre/ldlm/ldlm_lock.c  | 10 +++++-----
>  drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 17 ++++++++---------
>  drivers/staging/lustre/lustre/ldlm/ldlm_pool.c  |  3 +--
>  4 files changed, 16 insertions(+), 18 deletions(-)
> 
> diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c b/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c
> index c5c86e7..7bcae30 100644
> --- a/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c
> +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c
> @@ -668,10 +668,10 @@ int target_send_reply_msg(struct ptlrpc_request *req, int rc, int fail_id)
>  		DEBUG_REQ(D_NET, req, "processing error (%d)", rc);
>  		req->rq_status = rc;
>  		return ptlrpc_send_error(req, 1);
> -	} else {
> -		DEBUG_REQ(D_NET, req, "sending reply");
>  	}
>  
> +	DEBUG_REQ(D_NET, req, "sending reply");
> +
>  	return ptlrpc_send_reply(req, PTLRPC_REPLY_MAYBE_DIFFICULT);
>  }
>  
> diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c b/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c
> index bd8d458..28f2639 100644
> --- a/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c
> +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c
> @@ -932,7 +932,8 @@ static void search_granted_lock(struct list_head *queue,
>  			prev->mode_link = &mode_end->l_sl_mode;
>  			prev->policy_link = &req->l_sl_policy;
>  			return;
> -		} else if (lock->l_resource->lr_type == LDLM_IBITS) {
> +		}
> +		if (lock->l_resource->lr_type == LDLM_IBITS) {
>  			for (;;) {
>  				policy_end =
>  					list_entry(lock->l_sl_policy.prev,
> @@ -968,11 +969,10 @@ static void search_granted_lock(struct list_head *queue,
>  			prev->mode_link = &mode_end->l_sl_mode;
>  			prev->policy_link = &req->l_sl_policy;
>  			return;
> -		} else {
> -			LDLM_ERROR(lock,
> -				   "is not LDLM_PLAIN or LDLM_IBITS lock");
> -			LBUG();
>  		}
> +		LDLM_ERROR(lock,
> +				"is not LDLM_PLAIN or LDLM_IBITS lock");
> +		LBUG();
>  	}
>  
>  	/* insert point is last lock on the queue,
> diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c b/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c
> index cd15445..4abca14 100644
> --- a/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c
> +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c
> @@ -456,16 +456,15 @@ static int ldlm_bl_to_thread(struct ldlm_namespace *ns,
>  		init_blwi(blwi, ns, ld, cancels, count, lock, cancel_flags);
>  
>  		return __ldlm_bl_to_thread(blwi, cancel_flags);
> -	} else {
> -		/* if it is synchronous call do minimum mem alloc, as it could
> -		 * be triggered from kernel shrinker
> -		 */
> -		struct ldlm_bl_work_item blwi;
> -
> -		memset(&blwi, 0, sizeof(blwi));
> -		init_blwi(&blwi, ns, ld, cancels, count, lock, cancel_flags);
> -		return __ldlm_bl_to_thread(&blwi, cancel_flags);
>  	}
> +	/* if it is synchronous call do minimum mem alloc, as it could
> +	* be triggered from kernel shrinker
> +	*/

Formatting of this comment block changed :(