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 ...
Showing the changes to include/uapi/linux (1 of 160 files). Show all
Unified · Split
| @@ -52,6 +52,7 @@ enum blktrace_act { · 51 unmodified lines | |||
| 52 | __BLK_TA_REMAP, /* bio was remapped */ | 52 | __BLK_TA_REMAP, /* bio was remapped */ |
| 53 | __BLK_TA_ABORT, /* request aborted */ | 53 | __BLK_TA_ABORT, /* request aborted */ |
| 54 | __BLK_TA_DRV_DATA, /* driver-specific binary data */ | 54 | __BLK_TA_DRV_DATA, /* driver-specific binary data */ |
| 55 | __BLK_TA_CGROUP = 1 << 8, /* from a cgroup*/ | ||
| 55 | }; | 56 | }; |
| 56 | 57 | ||
| 57 | /* | 58 | /* |
| @@ -61,6 +62,7 @@ enum blktrace_notify { · 3 unmodified lines | |||
| 61 | __BLK_TN_PROCESS = 0, /* establish pid/name mapping */ | 62 | __BLK_TN_PROCESS = 0, /* establish pid/name mapping */ |
| 62 | __BLK_TN_TIMESTAMP, /* include system clock */ | 63 | __BLK_TN_TIMESTAMP, /* include system clock */ |
| 63 | __BLK_TN_MESSAGE, /* Character string message */ | 64 | __BLK_TN_MESSAGE, /* Character string message */ |
| 65 | __BLK_TN_CGROUP = __BLK_TA_CGROUP, /* from a cgroup */ | ||
| 64 | }; | 66 | }; |
| 65 | 67 | ||
| 66 | 68 | ||
| @@ -107,6 +109,7 @@ struct blk_io_trace { · 40 unmodified lines | |||
| 107 | __u32 cpu; /* on what cpu did it happen */ | 109 | __u32 cpu; /* on what cpu did it happen */ |
| 108 | __u16 error; /* completion error */ | 110 | __u16 error; /* completion error */ |
| 109 | __u16 pdu_len; /* length of data after this trace */ | 111 | __u16 pdu_len; /* length of data after this trace */ |
| 112 | /* cgroup id will be stored here if exists */ | ||
| 110 | }; | 113 | }; |
| 111 | 114 | ||
| 112 | /* | 115 | /* |