From: Jens Axboe <axboe@suse.de>
Date: Tue, 17 Jan 2006 10:09:27 +0000 (+0100)
Subject: [BLOCK] ll_rw_blk: use preempt-disabling disk_stat_add() in completion
X-Git-Tag: v2.6.16-rc2~249^2~6
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=53e86061b5bd4aece9bbb6b00b30720200596ecb;p=linux-2.6-omap-h63xx.git

[BLOCK] ll_rw_blk: use preempt-disabling disk_stat_add() in completion

It can legally be called with interrupts/preemption enabled.

Signed-off-by: Jens Axboe <axboe@suse.de>
---

diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c
index 5c62507a510..6bc41564c70 100644
--- a/block/ll_rw_blk.c
+++ b/block/ll_rw_blk.c
@@ -3153,7 +3153,7 @@ static int __end_that_request_first(struct request *req, int uptodate,
 	if (blk_fs_request(req) && req->rq_disk) {
 		const int rw = rq_data_dir(req);
 
-		__disk_stat_add(req->rq_disk, sectors[rw], nr_bytes >> 9);
+		disk_stat_add(req->rq_disk, sectors[rw], nr_bytes >> 9);
 	}
 
 	total_bytes = bio_nbytes = 0;