hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mg_disk: fix locking 

IRQ and timeout handlers call functions which expect locked queue lock
without locking it.  Fix it.

While at it, convert 0s used as null pointer constant to NULLs.

[ Impact: fix locking, cleanup ]

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: unsik Kim <donari75@gmail.com>
This commit is contained in:
Tejun Heo 2009-04-28 12:38:32 +09:00 committed by Jens Axboe
parent ce8a7424d2
commit ac2ff946a5
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/block/mg_disk.c
View File

@ -160,11 +160,16 @@ static irqreturn_t mg_irq(int irq, void *dev_id)
struct mg_host *host = dev_id; struct mg_host *host = dev_id;
void (*handler)(struct mg_host *) = host->mg_do_intr; void (*handler)(struct mg_host *) = host->mg_do_intr;
host->mg_do_intr = 0; spin_lock(&host->lock);
host->mg_do_intr = NULL;
del_timer(&host->timer); del_timer(&host->timer);
if (!handler) if (!handler)
handler = mg_unexpected_intr; handler = mg_unexpected_intr;
handler(host); handler(host);
spin_unlock(&host->lock);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
@ -319,7 +324,7 @@ static void mg_read(struct request *req)
remains = req->nr_sectors; remains = req->nr_sectors;
if (mg_out(host, req->sector, req->nr_sectors, MG_CMD_RD, 0) != if (mg_out(host, req->sector, req->nr_sectors, MG_CMD_RD, NULL) !=
MG_ERR_NONE) MG_ERR_NONE)
mg_bad_rw_intr(host); mg_bad_rw_intr(host);
@ -363,7 +368,7 @@ static void mg_write(struct request *req)
remains = req->nr_sectors; remains = req->nr_sectors;
if (mg_out(host, req->sector, req->nr_sectors, MG_CMD_WR, 0) != if (mg_out(host, req->sector, req->nr_sectors, MG_CMD_WR, NULL) !=
MG_ERR_NONE) { MG_ERR_NONE) {
mg_bad_rw_intr(host); mg_bad_rw_intr(host);
return; return;
@ -521,9 +526,11 @@ void mg_times_out(unsigned long data)
char *name; char *name;
struct request *req; struct request *req;
spin_lock_irq(&host->lock);
req = elv_next_request(host->breq); req = elv_next_request(host->breq);
if (!req) if (!req)
return; goto out_unlock;
host->mg_do_intr = NULL; host->mg_do_intr = NULL;
@ -534,6 +541,8 @@ void mg_times_out(unsigned long data)
mg_bad_rw_intr(host); mg_bad_rw_intr(host);
mg_request(host->breq); mg_request(host->breq);
out_unlock:
spin_unlock_irq(&host->lock);
} }
static void mg_request_poll(struct request_queue *q) static void mg_request_poll(struct request_queue *q)