Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad5ebd2f authored by Randy Dunlap's avatar Randy Dunlap Committed by Jens Axboe
Browse files

block: jiffies fixes 



Use HZ-independent calculation of milliseconds.
Add jiffies.h where it was missing since functions or macros
from it are used.

Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 86b37281

block/blk-settings.c

+2 −1
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#include <linux/blkdev.h>

#include <linux/bootmem.h>	/* for max_pfn/max_low_pfn */

#include <linux/gcd.h>

#include <linux/jiffies.h>



#include "blk.h"
@@ -144,7 +145,7 @@ void blk_queue_make_request(struct request_queue *q, make_request_fn *mfn) 
	q->nr_batching = BLK_BATCH_REQ;



	q->unplug_thresh = 4;		/* hmm */

	q->unplug_delay = (3 * HZ) / 1000;	/* 3 milliseconds */

	q->unplug_delay = msecs_to_jiffies(3);	/* 3 milliseconds */

	if (q->unplug_delay == 0)

		q->unplug_delay = 1;

block/bsg.c

+2 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/blkdev.h>

#include <linux/poll.h>

#include <linux/cdev.h>

#include <linux/jiffies.h>

#include <linux/percpu.h>

#include <linux/uio.h>

#include <linux/idr.h>
@@ -197,7 +198,7 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq, 
	rq->cmd_len = hdr->request_len;

	rq->cmd_type = REQ_TYPE_BLOCK_PC;



	rq->timeout = (hdr->timeout * HZ) / 1000;

	rq->timeout = msecs_to_jiffies(hdr->timeout);

	if (!rq->timeout)

		rq->timeout = q->sg_timeout;

	if (!rq->timeout)

block/cfq-iosched.c

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <linux/module.h>

#include <linux/blkdev.h>

#include <linux/elevator.h>

#include <linux/jiffies.h>

#include <linux/rbtree.h>

#include <linux/ioprio.h>

#include <linux/blktrace_api.h>