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

[Douglas Gilbert <dgilbert@interlog.com>]

On 12-04-12 05:32 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 |   30 +++++++++++++-----------------
>   1 files changed, 13 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
> index 14de843..f9e89b2 100644
> --- a/drivers/scsi/sg.c
> +++ b/drivers/scsi/sg.c
> @@ -801,25 +801,21 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg)
>   				 1, read_only, 1,&srp);
>   		if (result<  0)
>   			return result;
> -		while (1) {
> -			result = 0;	/* following macro to beat race condition */
> -			__wait_event_interruptible(sfp->read_wait,
> -				(srp->done || sdp->detached),
> -				result);
> -			if (sdp->detached)
> -				return -ENODEV;
> -			write_lock_irq(&sfp->rq_list_lock);
> -			if (srp->done) {
> -				srp->done = 2;
> -				write_unlock_irq(&sfp->rq_list_lock);
> -				break;
> -			}
> -			srp->orphan = 1;
> +		result = 0;	/* following macro to beat race condition */
> +		__wait_event_interruptible(sfp->read_wait,
> +			(srp->done || sdp->detached), result);
> +		if (sdp->detached)
> +			return -ENODEV;
> +		write_lock_irq(&sfp->rq_list_lock);
> +		if (srp->done) {
> +			srp->done = 2;
>   			write_unlock_irq(&sfp->rq_list_lock);
> -			return result;	/* -ERESTARTSYS because signal hit process */
> +			result = sg_new_read(sfp, p, SZ_SG_IO_HDR, srp);
> +			return (result<  0) ? result : 0;
>   		}
> -		result = sg_new_read(sfp, p, SZ_SG_IO_HDR, srp);
> -		return (result<  0) ? result : 0;
> +		srp->orphan = 1;
> +		write_unlock_irq(&sfp->rq_list_lock);
> +		return result;	/* -ERESTARTSYS because signal hit process */
>   	case SG_SET_TIMEOUT:
>   		result = get_user(val, ip);
>   		if (result)

--
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