Merge branch 'for-4.14/block' of git://git.kernel.dk/linux-block
Pull block layer updates from Jens Axboe:
"This is the first pull request for 4.14, containing most of the code
changes. It's a quiet series this round, which I think we needed after
the churn of the last few series. This contains:
- Fix for a registration race in loop, from Anton Volkov.
- Overflow complaint fix from Arnd for DAC960.
- Series of drbd changes from the usual suspects.
- Conversion of the stec/skd driver to blk-mq. From Bart.
- A few BFQ improvements/fixes from Paolo.
- CFQ improvement from Ritesh, allowing idling for group idle.
- A few fixes found by Dan's smatch, courtesy of Dan.
- A warning fixup for a race between changing the IO scheduler and
device remova. From David Jeffery.
- A few nbd fixes from Josef.
- Support for cgroup info in blktrace, from Shaohua.
- Also from Shaohua, new features in the null_blk driver to allow it
to actually hold data, among other things.
- Various corner cases and error handling fixes from Weiping Zhang.
- Improvements to the IO stats tracking for blk-mq from me. Can
drastically improve performance for fast devices and/or big
machines.
- Series from Christoph removing bi_bdev as being needed for IO
submission, in preparation for nvme multipathing code.
- Series from Bart, including various cleanups and fixes for switch
fall through case complaints"
* 'for-4.14/block' of git://git.kernel.dk/linux-block: (162 commits)
kernfs: checking for IS_ERR() instead of NULL
drbd: remove BIOSET_NEED_RESCUER flag from drbd_{md_,}io_bio_set
drbd: Fix allyesconfig build, fix recent commit
drbd: switch from kmalloc() to kmalloc_array()
drbd: abort drbd_start_resync if there is no connection
drbd: move global variables to drbd namespace and make some static
drbd: rename "usermode_helper" to "drbd_usermode_helper"
drbd: fix race between handshake and admin disconnect/down
drbd: fix potential deadlock when trying to detach during handshake
drbd: A single dot should be put into a sequence.
drbd: fix rmmod cleanup, remove _all_ debugfs entries
drbd: Use setup_timer() instead of init_timer() to simplify the code.
drbd: fix potential get_ldev/put_ldev refcount imbalance during attach
drbd: new disk-option disable-write-same
drbd: Fix resource role for newly created resources in events2
drbd: mark symbols static where possible
drbd: Send P_NEG_ACK upon write error in protocol != C
drbd: add explicit plugging when submitting batches
drbd: change list_for_each_safe to while(list_first_entry_or_null)
drbd: introduce drbd_recv_header_maybe_unplug
...
This commit is contained in:
Linus Torvalds
@@ -600,38 +600,36 @@ struct request_queue {
|
||||
u64 write_hints[BLK_MAX_WRITE_HINTS];
|
||||
};
|
||||
|
||||
#define QUEUE_FLAG_QUEUED 1 /* uses generic tag queueing */
|
||||
#define QUEUE_FLAG_STOPPED 2 /* queue is stopped */
|
||||
#define QUEUE_FLAG_SYNCFULL 3 /* read queue has been filled */
|
||||
#define QUEUE_FLAG_ASYNCFULL 4 /* write queue has been filled */
|
||||
#define QUEUE_FLAG_DYING 5 /* queue being torn down */
|
||||
#define QUEUE_FLAG_BYPASS 6 /* act as dumb FIFO queue */
|
||||
#define QUEUE_FLAG_BIDI 7 /* queue supports bidi requests */
|
||||
#define QUEUE_FLAG_NOMERGES 8 /* disable merge attempts */
|
||||
#define QUEUE_FLAG_SAME_COMP 9 /* complete on same CPU-group */
|
||||
#define QUEUE_FLAG_FAIL_IO 10 /* fake timeout */
|
||||
#define QUEUE_FLAG_STACKABLE 11 /* supports request stacking */
|
||||
#define QUEUE_FLAG_NONROT 12 /* non-rotational device (SSD) */
|
||||
#define QUEUE_FLAG_QUEUED 0 /* uses generic tag queueing */
|
||||
#define QUEUE_FLAG_STOPPED 1 /* queue is stopped */
|
||||
#define QUEUE_FLAG_DYING 2 /* queue being torn down */
|
||||
#define QUEUE_FLAG_BYPASS 3 /* act as dumb FIFO queue */
|
||||
#define QUEUE_FLAG_BIDI 4 /* queue supports bidi requests */
|
||||
#define QUEUE_FLAG_NOMERGES 5 /* disable merge attempts */
|
||||
#define QUEUE_FLAG_SAME_COMP 6 /* complete on same CPU-group */
|
||||
#define QUEUE_FLAG_FAIL_IO 7 /* fake timeout */
|
||||
#define QUEUE_FLAG_STACKABLE 8 /* supports request stacking */
|
||||
#define QUEUE_FLAG_NONROT 9 /* non-rotational device (SSD) */
|
||||
#define QUEUE_FLAG_VIRT QUEUE_FLAG_NONROT /* paravirt device */
|
||||
#define QUEUE_FLAG_IO_STAT 13 /* do IO stats */
|
||||
#define QUEUE_FLAG_DISCARD 14 /* supports DISCARD */
|
||||
#define QUEUE_FLAG_NOXMERGES 15 /* No extended merges */
|
||||
#define QUEUE_FLAG_ADD_RANDOM 16 /* Contributes to random pool */
|
||||
#define QUEUE_FLAG_SECERASE 17 /* supports secure erase */
|
||||
#define QUEUE_FLAG_SAME_FORCE 18 /* force complete on same CPU */
|
||||
#define QUEUE_FLAG_DEAD 19 /* queue tear-down finished */
|
||||
#define QUEUE_FLAG_INIT_DONE 20 /* queue is initialized */
|
||||
#define QUEUE_FLAG_NO_SG_MERGE 21 /* don't attempt to merge SG segments*/
|
||||
#define QUEUE_FLAG_POLL 22 /* IO polling enabled if set */
|
||||
#define QUEUE_FLAG_WC 23 /* Write back caching */
|
||||
#define QUEUE_FLAG_FUA 24 /* device supports FUA writes */
|
||||
#define QUEUE_FLAG_FLUSH_NQ 25 /* flush not queueuable */
|
||||
#define QUEUE_FLAG_DAX 26 /* device supports DAX */
|
||||
#define QUEUE_FLAG_STATS 27 /* track rq completion times */
|
||||
#define QUEUE_FLAG_POLL_STATS 28 /* collecting stats for hybrid polling */
|
||||
#define QUEUE_FLAG_REGISTERED 29 /* queue has been registered to a disk */
|
||||
#define QUEUE_FLAG_SCSI_PASSTHROUGH 30 /* queue supports SCSI commands */
|
||||
#define QUEUE_FLAG_QUIESCED 31 /* queue has been quiesced */
|
||||
#define QUEUE_FLAG_IO_STAT 10 /* do IO stats */
|
||||
#define QUEUE_FLAG_DISCARD 11 /* supports DISCARD */
|
||||
#define QUEUE_FLAG_NOXMERGES 12 /* No extended merges */
|
||||
#define QUEUE_FLAG_ADD_RANDOM 13 /* Contributes to random pool */
|
||||
#define QUEUE_FLAG_SECERASE 14 /* supports secure erase */
|
||||
#define QUEUE_FLAG_SAME_FORCE 15 /* force complete on same CPU */
|
||||
#define QUEUE_FLAG_DEAD 16 /* queue tear-down finished */
|
||||
#define QUEUE_FLAG_INIT_DONE 17 /* queue is initialized */
|
||||
#define QUEUE_FLAG_NO_SG_MERGE 18 /* don't attempt to merge SG segments*/
|
||||
#define QUEUE_FLAG_POLL 19 /* IO polling enabled if set */
|
||||
#define QUEUE_FLAG_WC 20 /* Write back caching */
|
||||
#define QUEUE_FLAG_FUA 21 /* device supports FUA writes */
|
||||
#define QUEUE_FLAG_FLUSH_NQ 22 /* flush not queueuable */
|
||||
#define QUEUE_FLAG_DAX 23 /* device supports DAX */
|
||||
#define QUEUE_FLAG_STATS 24 /* track rq completion times */
|
||||
#define QUEUE_FLAG_POLL_STATS 25 /* collecting stats for hybrid polling */
|
||||
#define QUEUE_FLAG_REGISTERED 26 /* queue has been registered to a disk */
|
||||
#define QUEUE_FLAG_SCSI_PASSTHROUGH 27 /* queue supports SCSI commands */
|
||||
#define QUEUE_FLAG_QUIESCED 28 /* queue has been quiesced */
|
||||
|
||||
#define QUEUE_FLAG_DEFAULT ((1 << QUEUE_FLAG_IO_STAT) | \
|
||||
(1 << QUEUE_FLAG_STACKABLE) | \
|
||||
|
||||
Reference in New Issue
Block a user