History

Merge tag 'for-5.6/drivers-2020-01-27' of git://git.kernel.dk/linux-block

Pull block driver updates from Jens Axboe: "Like the core side, not a lot of changes here, just two main items: - Series of patches (via Coly) with fixes for bcache (Coly, Christoph) - MD pull request from Song" * tag 'for-5.6/drivers-2020-01-27' of git://git.kernel.dk/linux-block: (31 commits) bcache: reap from tail of c->btree_cache in bch_mca_scan() bcache: reap c->btree_cache_freeable from the tail in bch_mca_scan() bcache: remove member accessed from struct btree bcache: print written and keys in trace_bcache_btree_write bcache: avoid unnecessary btree nodes flushing in btree_flush_write() bcache: add code comments for state->pool in __btree_sort() lib: crc64: include <linux/crc64.h> for 'crc64_be' bcache: use read_cache_page_gfp to read the superblock bcache: store a pointer to the on-disk sb in the cache and cached_dev structures bcache: return a pointer to the on-disk sb from read_super bcache: transfer the sb_page reference to register_{bdev,cache} bcache: fix use-after-free in register_bcache() bcache: properly initialize 'path' and 'err' in register_bcache() bcache: rework error unwinding in register_bcache bcache: use a separate data structure for the on-disk super block bcache: cached_dev_free needs to put the sb page md/raid1: introduce wait_for_serialization md/raid1: use bucket based mechanism for IO serialization md: introduce a new struct for IO serialization md: don't destroy serial_info_pool if serialize_policy is true ...

Linus Torvalds committed 6 years ago

Commit 22a8f392 parents 48b4b4f e3de04417 files · +571 −262Browse files

Showing the changes to include/linux (1 of 17 files). Show all

Unified · Split

include/linux/raid/pq.h+6−1
@@ -27,8 +27,8 @@ extern const char raid6_empty_zero_page[PAGE_SIZE]; · 26 unmodified lines
27 27
28#include <errno.h>28#include <errno.h>
29#include <inttypes.h>29#include <inttypes.h>
30#include <limits.h>
31#include <stddef.h>30#include <stddef.h>
31#include <string.h>
32#include <sys/mman.h>32#include <sys/mman.h>
33#include <sys/time.h>33#include <sys/time.h>
34#include <sys/types.h>34#include <sys/types.h>
@@ -44,6 +44,9 @@ typedef uint64_t u64; · 9 unmodified lines
44#ifndef PAGE_SIZE44#ifndef PAGE_SIZE
45# define PAGE_SIZE 409645# define PAGE_SIZE 4096
46#endif46#endif
47#ifndef PAGE_SHIFT
48# define PAGE_SHIFT 12
49#endif
47extern const char raid6_empty_zero_page[PAGE_SIZE];50extern const char raid6_empty_zero_page[PAGE_SIZE];
48 51
49#define __init52#define __init
@@ -59,7 +62,9 @@ extern const char raid6_empty_zero_page[PAGE_SIZE]; · 9 unmodified lines
59#define enable_kernel_altivec()62#define enable_kernel_altivec()
60#define disable_kernel_altivec()63#define disable_kernel_altivec()
61 64
65#undef EXPORT_SYMBOL
62#define EXPORT_SYMBOL(sym)66#define EXPORT_SYMBOL(sym)
67#undef EXPORT_SYMBOL_GPL
63#define EXPORT_SYMBOL_GPL(sym)68#define EXPORT_SYMBOL_GPL(sym)
64#define MODULE_LICENSE(licence)69#define MODULE_LICENSE(licence)
65#define MODULE_DESCRIPTION(desc)70#define MODULE_DESCRIPTION(desc)