From a9979b7b5e6c13c6e3fb87eebce9fa61c952d57b Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Tue, 7 Feb 2006 15:00:01 +0100 Subject: [PATCH] --- yaml --- r: 19925 b: refs/heads/master c: d43da75fd6be4197c280903e1553eafcc39218e2 h: refs/heads/master i: 19923: 913fd378aa6c6928e63b92cbaa1f977ed9e69809 v: v3 --- [refs] | 2 +- trunk/drivers/block/cciss.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8b9dd996deb3..71cf663c7b04 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e8a82fd030c2e0ba4d4169cc4257ef174ff6f6b4 +refs/heads/master: d43da75fd6be4197c280903e1553eafcc39218e2 diff --git a/trunk/drivers/block/cciss.c b/trunk/drivers/block/cciss.c index 12d7b9bdfa93..0d65394707db 100644 --- a/trunk/drivers/block/cciss.c +++ b/trunk/drivers/block/cciss.c @@ -2183,6 +2183,7 @@ static void cciss_softirq_done(struct request *rq) { CommandList_struct *cmd = rq->completion_data; ctlr_info_t *h = hba[cmd->ctlr]; + unsigned long flags; u64bit temp64; int i, ddir; @@ -2205,10 +2206,10 @@ static void cciss_softirq_done(struct request *rq) printk("Done with %p\n", rq); #endif /* CCISS_DEBUG */ - spin_lock_irq(&h->lock); + spin_lock_irqsave(&h->lock, flags); end_that_request_last(rq, rq->errors); cmd_free(h, cmd,1); - spin_unlock_irq(&h->lock); + spin_unlock_irqrestore(&h->lock, flags); } /* checks the status of the job and calls complete buffers to mark all