aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorJens Axboe <jaxboe@fusionio.com>2011-03-02 11:08:00 -0500
committerJens Axboe <jaxboe@fusionio.com>2011-03-10 02:45:54 -0500
commit3cca6dc1c81e2407928dc4c6105252146fd3924f (patch)
treeb78b0d93e7c02abdc37e1d5a6204ab6b94d56fd4 /include/linux
parent53f22956effe1c9e7961b8c6e4362ecca5e460b7 (diff)
block: add API for delaying work/request_fn a little bit
Currently we use plugging for that, but as plugging is going away, we need an alternative mechanism. Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/blkdev.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index e3ee74fc5903..f55b2a8b6610 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -300,6 +300,11 @@ struct request_queue
300 unsigned long unplug_delay; /* After this many jiffies */ 300 unsigned long unplug_delay; /* After this many jiffies */
301 struct work_struct unplug_work; 301 struct work_struct unplug_work;
302 302
303 /*
304 * Delayed queue handling
305 */
306 struct delayed_work delay_work;
307
303 struct backing_dev_info backing_dev_info; 308 struct backing_dev_info backing_dev_info;
304 309
305 /* 310 /*
@@ -677,6 +682,7 @@ extern int blk_insert_cloned_request(struct request_queue *q,
677extern void blk_plug_device(struct request_queue *); 682extern void blk_plug_device(struct request_queue *);
678extern void blk_plug_device_unlocked(struct request_queue *); 683extern void blk_plug_device_unlocked(struct request_queue *);
679extern int blk_remove_plug(struct request_queue *); 684extern int blk_remove_plug(struct request_queue *);
685extern void blk_delay_queue(struct request_queue *, unsigned long);
680extern void blk_recount_segments(struct request_queue *, struct bio *); 686extern void blk_recount_segments(struct request_queue *, struct bio *);
681extern int scsi_cmd_ioctl(struct request_queue *, struct gendisk *, fmode_t, 687extern int scsi_cmd_ioctl(struct request_queue *, struct gendisk *, fmode_t,
682 unsigned int, void __user *); 688 unsigned int, void __user *);