aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--block/ll_rw_blk.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c
index b01dee3ae7f3..49c0f18cb783 100644
--- a/block/ll_rw_blk.c
+++ b/block/ll_rw_blk.c
@@ -39,7 +39,7 @@
39 39
40static void blk_unplug_work(struct work_struct *work); 40static void blk_unplug_work(struct work_struct *work);
41static void blk_unplug_timeout(unsigned long data); 41static void blk_unplug_timeout(unsigned long data);
42static void drive_stat_acct(struct request *rq, int nr_sectors, int new_io); 42static void drive_stat_acct(struct request *rq, int new_io);
43static void init_request_from_bio(struct request *req, struct bio *bio); 43static void init_request_from_bio(struct request *req, struct bio *bio);
44static int __make_request(struct request_queue *q, struct bio *bio); 44static int __make_request(struct request_queue *q, struct bio *bio);
45static struct io_context *current_io_context(gfp_t gfp_flags, int node); 45static struct io_context *current_io_context(gfp_t gfp_flags, int node);
@@ -2341,7 +2341,7 @@ void blk_insert_request(struct request_queue *q, struct request *rq,
2341 if (blk_rq_tagged(rq)) 2341 if (blk_rq_tagged(rq))
2342 blk_queue_end_tag(q, rq); 2342 blk_queue_end_tag(q, rq);
2343 2343
2344 drive_stat_acct(rq, rq->nr_sectors, 1); 2344 drive_stat_acct(rq, 1);
2345 __elv_add_request(q, rq, where, 0); 2345 __elv_add_request(q, rq, where, 0);
2346 blk_start_queueing(q); 2346 blk_start_queueing(q);
2347 spin_unlock_irqrestore(q->queue_lock, flags); 2347 spin_unlock_irqrestore(q->queue_lock, flags);
@@ -2736,7 +2736,7 @@ int blkdev_issue_flush(struct block_device *bdev, sector_t *error_sector)
2736 2736
2737EXPORT_SYMBOL(blkdev_issue_flush); 2737EXPORT_SYMBOL(blkdev_issue_flush);
2738 2738
2739static void drive_stat_acct(struct request *rq, int nr_sectors, int new_io) 2739static void drive_stat_acct(struct request *rq, int new_io)
2740{ 2740{
2741 int rw = rq_data_dir(rq); 2741 int rw = rq_data_dir(rq);
2742 2742
@@ -2758,7 +2758,7 @@ static void drive_stat_acct(struct request *rq, int nr_sectors, int new_io)
2758 */ 2758 */
2759static inline void add_request(struct request_queue * q, struct request * req) 2759static inline void add_request(struct request_queue * q, struct request * req)
2760{ 2760{
2761 drive_stat_acct(req, req->nr_sectors, 1); 2761 drive_stat_acct(req, 1);
2762 2762
2763 /* 2763 /*
2764 * elevator indicated where it wants this request to be 2764 * elevator indicated where it wants this request to be
@@ -3015,7 +3015,7 @@ static int __make_request(struct request_queue *q, struct bio *bio)
3015 req->biotail = bio; 3015 req->biotail = bio;
3016 req->nr_sectors = req->hard_nr_sectors += nr_sectors; 3016 req->nr_sectors = req->hard_nr_sectors += nr_sectors;
3017 req->ioprio = ioprio_best(req->ioprio, prio); 3017 req->ioprio = ioprio_best(req->ioprio, prio);
3018 drive_stat_acct(req, nr_sectors, 0); 3018 drive_stat_acct(req, 0);
3019 if (!attempt_back_merge(q, req)) 3019 if (!attempt_back_merge(q, req))
3020 elv_merged_request(q, req, el_ret); 3020 elv_merged_request(q, req, el_ret);
3021 goto out; 3021 goto out;
@@ -3042,7 +3042,7 @@ static int __make_request(struct request_queue *q, struct bio *bio)
3042 req->sector = req->hard_sector = bio->bi_sector; 3042 req->sector = req->hard_sector = bio->bi_sector;
3043 req->nr_sectors = req->hard_nr_sectors += nr_sectors; 3043 req->nr_sectors = req->hard_nr_sectors += nr_sectors;
3044 req->ioprio = ioprio_best(req->ioprio, prio); 3044 req->ioprio = ioprio_best(req->ioprio, prio);
3045 drive_stat_acct(req, nr_sectors, 0); 3045 drive_stat_acct(req, 0);
3046 if (!attempt_front_merge(q, req)) 3046 if (!attempt_front_merge(q, req))
3047 elv_merged_request(q, req, el_ret); 3047 elv_merged_request(q, req, el_ret);
3048 goto out; 3048 goto out;