Messages in this thread Patch in this message | | | Subject | [patch 12/15] 9/34: block/swim_iop: replace interruptible_sleep_on() with wait_event_interruptible() | From | domen@coderock ... | Date | Sat, 05 Mar 2005 23:43:19 +0100 |
| |
Use wait_event_interruptible() instead of the deprecated interruptible_sleep_on(). The change is pretty straight-forward, as the current sleep is conditional.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> Signed-off-by: Domen Puncer <domen@coderock.org> ---
kj-domen/drivers/block/swim_iop.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-)
diff -puN drivers/block/swim_iop.c~wait_event_int-drivers_block_swim_iop drivers/block/swim_iop.c --- kj/drivers/block/swim_iop.c~wait_event_int-drivers_block_swim_iop 2005-03-05 16:11:56.000000000 +0100 +++ kj-domen/drivers/block/swim_iop.c 2005-03-05 16:11:56.000000000 +0100 @@ -32,6 +32,7 @@ #include <linux/fd.h> #include <linux/ioctl.h> #include <linux/blkdev.h> +#include <linux/wait.h> #include <asm/io.h> #include <asm/uaccess.h> #include <asm/mac_iop.h> @@ -431,13 +432,11 @@ static int grab_drive(struct floppy_stat local_irq_save(flags); if (fs->state != idle) { ++fs->wanted; - while (fs->state != available) { - if (interruptible && signal_pending(current)) { - --fs->wanted; - local_irq_restore(flags); - return -EINTR; - } - interruptible_sleep_on(&fs->wait); + wait_event_interruptible(fs->wait, (fs->state == available)); + if (interruptible && signal_pending(current)) { + --fs->wanted; + local_irq_restore(flags); + return -EINTR; } --fs->wanted; } _ - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |