From af7e7b8599ddedc79b2c3f4191a95c9ba1c4d448 Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Fri, 3 Apr 2009 19:28:06 +0900 Subject: [PATCH] --- yaml --- r: 142131 b: refs/heads/master c: 015640edb1f346e0b2eda703587c4cd1c310ec1d h: refs/heads/master i: 142129: 93e870fcbdabb30d35b9eeae7181655b401c3402 142127: dc58d1e1b247bb75595f2dd926cd6d0dd46e0520 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/sg.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index dac21c8d343f..b7c04b7bc828 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1beb6fa85ca9afaee109811a3f4a984232a32a4f +refs/heads/master: 015640edb1f346e0b2eda703587c4cd1c310ec1d diff --git a/trunk/drivers/scsi/sg.c b/trunk/drivers/scsi/sg.c index 1e405184ed76..82312df9b0bf 100644 --- a/trunk/drivers/scsi/sg.c +++ b/trunk/drivers/scsi/sg.c @@ -1312,8 +1312,10 @@ static void sg_rq_end_io(struct request *rq, int uptodate) wake_up_interruptible(&sfp->read_wait); kill_fasync(&sfp->async_qp, SIGPOLL, POLL_IN); kref_put(&sfp->f_ref, sg_remove_sfp); - } else - execute_in_process_context(sg_rq_end_io_usercontext, &srp->ew); + } else { + INIT_WORK(&srp->ew.work, sg_rq_end_io_usercontext); + schedule_work(&srp->ew.work); + } } static struct file_operations sg_fops = { @@ -2099,7 +2101,8 @@ static void sg_remove_sfp(struct kref *kref) write_unlock_irqrestore(&sg_index_lock, iflags); wake_up_interruptible(&sdp->o_excl_wait); - execute_in_process_context(sg_remove_sfp_usercontext, &sfp->ew); + INIT_WORK(&sfp->ew.work, sg_remove_sfp_usercontext); + schedule_work(&sfp->ew.work); } static int