Re: [PATCH 8/9] dlm: plock: Reduce indentation by rearranging order

[Jeff Layton]

On Sun, 20 Jul 2014 11:23:42 -0700
Joe Perches <joe@xxxxxxxxxxx> wrote:

> if blocks that have a goto at the end of one branch can be
> simplified by reordering and unindenting.
> 
> Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
> ---
>  fs/dlm/plock.c | 26 +++++++++++++-------------
>  1 file changed, 13 insertions(+), 13 deletions(-)
> 
> diff --git a/fs/dlm/plock.c b/fs/dlm/plock.c
> index e0ab3a9..3e0b6fc 100644
> --- a/fs/dlm/plock.c
> +++ b/fs/dlm/plock.c
> @@ -144,23 +144,23 @@ int dlm_posix_lock(dlm_lockspace_t *lockspace, u64 number, struct file *file,
>  
>  	send_op(op);
>  
> -	if (xop->callback == NULL) {
> -		rv = wait_event_killable(recv_wq, (op->done != 0));
> -		if (rv == -ERESTARTSYS) {
> -			log_debug(ls, "dlm_posix_lock: wait killed %llx",
> -				  (unsigned long long)number);
> -			spin_lock(&ops_lock);
> -			list_del(&op->list);
> -			spin_unlock(&ops_lock);
> -			kfree(xop);
> -			do_unlock_close(ls, number, file, fl);
> -			goto out;
> -		}
> -	} else {
> +	if (xop->callback) {
>  		rv = FILE_LOCK_DEFERRED;
>  		goto out;
>  	}
>  
> +	rv = wait_event_killable(recv_wq, (op->done != 0));
> +	if (rv == -ERESTARTSYS) {
> +		log_debug(ls, "dlm_posix_lock: wait killed %llx",
> +			  (unsigned long long)number);
> +		spin_lock(&ops_lock);
> +		list_del(&op->list);
> +		spin_unlock(&ops_lock);
> +		kfree(xop);
> +		do_unlock_close(ls, number, file, fl);
> +		goto out;
> +	}
> +
>  	spin_lock(&ops_lock);
>  	if (!list_empty(&op->list)) {
>  		log_error(ls, "dlm_posix_lock: op on list %llx",

Looks right.

Reviewed-by: Jeff Layton <jlayton@xxxxxxxxxxxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/