block layer: remove a unused argument of drive_stat_acct()
PATCH 1/1 block layer: remove a unused argument of drive_stat_acct()
The nr_sector argument of drive_stat_acct() is not used anymore since the read and write sectors statistics are now updated in end_that_request_first(). This patch removes the useless argument.
Signed-off-by Jerome Marchand <[email protected]>
--- ll_rw_blk.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
block/ll_rw_blk.c +6 -6
@@ -39,7 +39,7 @@static void blk_unplug_work (struct work_struct *work);static void blk_unplug_timeout (unsigned long data); -static void drive_stat_acct (struct request *rq,int nr_sectors,int new_io); +static void drive_stat_acct (struct request *rq,int new_io);static void init_request_from_bio (struct request *req,struct bio *bio);static int __make_request (struct request_queue *q,struct bio *bio);static struct io_context *current_io_context (gfp_t gfp_flags,int node);
@@ -2329,7 +2329,7 @@ void blk_insert_request(struct request_queue *q, struct request *rq,if (blk_rq_tagged (rq))blk_queue_end_tag (q, rq); -drive_stat_acct (rq, rq->nr_sectors,1 ); +drive_stat_acct (rq,1 );__elv_add_request (q, rq, where,0 );blk_start_queueing (q);spin_unlock_irqrestore (q->queue_lock, flags);
@@ -2724,7 +2724,7 @@ int blkdev_issue_flush(struct block_device *bdev, sector_t *error_sector)EXPORT_SYMBOL (blkdev_issue_flush); -static void drive_stat_acct (struct request *rq,int nr_sectors,int new_io) +static void drive_stat_acct (struct request *rq,int new_io) {int rw =rq_data_dir (rq);
@@ -2746,7 +2746,7 @@ static void drive_stat_acct(struct request *rq, int nr_sectors, int new_io)*/ static inline void add_request (struct request_queue * q,struct request * req) { -drive_stat_acct (req, req->nr_sectors,1 ); +drive_stat_acct (req,1 );/* * elevator indicated where it wants this request to be
@@ -3003,7 +3003,7 @@ static int __make_request(struct request_queue *q, struct bio *bio) req->biotail = bio; req->nr_sectors = req->hard_nr_sectors += nr_sectors; req->ioprio =ioprio_best (req->ioprio, prio); -drive_stat_acct (req, nr_sectors,0 ); +drive_stat_acct (req,0 );if (!attempt_back_merge (q, req))elv_merged_request (q, req, el_ret); goto out;
@@ -3030,7 +3030,7 @@ static int __make_request(struct request_queue *q, struct bio *bio) req->sector = req->hard_sector = bio->bi_sector; req->nr_sectors = req->hard_nr_sectors += nr_sectors; req->ioprio =ioprio_best (req->ioprio, prio); -drive_stat_acct (req, nr_sectors,0 ); +drive_stat_acct (req,0 );if (!attempt_front_merge (q, req))elv_merged_request (q, req, el_ret); goto out;
Jens Axboe
AppliedQuoted 3 lines · Jerome Marchand
The
nr_sectorargument ofdrive_stat_acct()is not used anymore since the read and write sectors statistics are now updated inend_that_request_first(). This patch removes the useless argument.
Thanks, applied.
Signature · 1 line
Jens Axboe