Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f0c6aba authored by Jörn Engel's avatar Jörn Engel Committed by James Bottomley
Browse files

[SCSI] sg: use wait_event_interruptible() 



Afaics the use of __wait_event_interruptible() as opposed to
wait_event_interruptible() is purely historic.  So let's follow the rest
of the kernel and check the condition before prepare_to_wait() - and
also make the code a bit nicer.

Signed-off-by: default avatarJoern Engel <joern@logfs.org>
Acked-by: default avatarDouglas Gilbert <dgilbert@interlog.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 794c10fa

drivers/scsi/sg.c

+7 −12
Original line number Diff line number Diff line
@@ -268,9 +268,8 @@ sg_open(struct inode *inode, struct file *filp) 
			retval = -EBUSY;

			goto error_out;

		}

		res = 0;

		__wait_event_interruptible(sdp->o_excl_wait,

					   ((!list_empty(&sdp->sfds) || sdp->exclude) ? 0 : (sdp->exclude = 1)), res);

		res = wait_event_interruptible(sdp->o_excl_wait,

					   ((!list_empty(&sdp->sfds) || sdp->exclude) ? 0 : (sdp->exclude = 1)));

		if (res) {

			retval = res;	/* -ERESTARTSYS because signal hit process */

			goto error_out;
@@ -280,9 +279,7 @@ sg_open(struct inode *inode, struct file *filp) 
			retval = -EBUSY;

			goto error_out;

		}

		res = 0;

		__wait_event_interruptible(sdp->o_excl_wait, (!sdp->exclude),

					   res);

		res = wait_event_interruptible(sdp->o_excl_wait, !sdp->exclude);

		if (res) {

			retval = res;	/* -ERESTARTSYS because signal hit process */

			goto error_out;
@@ -398,10 +395,9 @@ sg_read(struct file *filp, char __user *buf, size_t count, loff_t * ppos) 
			retval = -EAGAIN;

			goto free_old_hdr;

		}

		retval = 0; /* following macro beats race condition */

		__wait_event_interruptible(sfp->read_wait,

		retval = wait_event_interruptible(sfp->read_wait,

			(sdp->detached ||

			(srp = sg_get_rq_mark(sfp, req_pack_id))), retval);

			(srp = sg_get_rq_mark(sfp, req_pack_id))));

		if (sdp->detached) {

			retval = -ENODEV;

			goto free_old_hdr;
@@ -797,9 +793,8 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg) 
				 1, read_only, 1, &srp);

		if (result < 0)

			return result;

		result = 0;	/* following macro to beat race condition */

		__wait_event_interruptible(sfp->read_wait,

			(srp->done || sdp->detached), result);

		result = wait_event_interruptible(sfp->read_wait,

			(srp->done || sdp->detached));

		if (sdp->detached)

			return -ENODEV;

		write_lock_irq(&sfp->rq_list_lock);