Re: [PATCH 03/10] sg: remove while (1) non-loop

[Douglas Gilbert <dgilbert@interlog.com>]

On 12-04-12 05:33 PM, Jörn Engel wrote:
> The while (1) construct isn't actually a loop at all.  So let's not
> pretent and obfuscate the code.
>
> Signed-off-by: Joern Engel<joern@logfs.org>

Acked-by: Douglas Gilbert <dgilbert@interlog.com>

> ---
>   drivers/scsi/sg.c |   22 +++++++++-------------
>   1 files changed, 9 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
> index f9e89b2..be812e0 100644
> --- a/drivers/scsi/sg.c
> +++ b/drivers/scsi/sg.c
> @@ -398,19 +398,15 @@ sg_read(struct file *filp, char __user *buf, size_t count, loff_t * ppos)
>   			retval = -EAGAIN;
>   			goto free_old_hdr;
>   		}
> -		while (1) {
> -			retval = 0; /* following macro beats race condition */
> -			__wait_event_interruptible(sfp->read_wait,
> -				(sdp->detached ||
> -				(srp = sg_get_rq_mark(sfp, req_pack_id))),
> -				retval);
> -			if (sdp->detached) {
> -				retval = -ENODEV;
> -				goto free_old_hdr;
> -			}
> -			if (0 == retval)
> -				break;
> -
> +		retval = 0; /* following macro beats race condition */
> +		__wait_event_interruptible(sfp->read_wait,
> +			(sdp->detached ||
> +			(srp = sg_get_rq_mark(sfp, req_pack_id))), retval);
> +		if (sdp->detached) {
> +			retval = -ENODEV;
> +			goto free_old_hdr;
> +		}
> +		if (retval) {
>   			/* -ERESTARTSYS as signal hit process */
>   			goto free_old_hdr;
>   		}

--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html