Merge tag 'for-4.19/post-20180822' of git://git.kernel.dk/linux-block

Pull more block updates from Jens Axboe: - Set of bcache fixes and changes (Coly) - The flush warn fix (me) - Small series of BFQ fixes (Paolo) - wbt hang fix (Ming) - blktrace fix (Steven) - blk-mq hardware queue count update fix (Jianchao) - Various little fixes * tag 'for-4.19/post-20180822' of git://git.kernel.dk/linux-block: (31 commits) block/DAC960.c: make some arrays static const, shrinks object size blk-mq: sync the update nr_hw_queues with blk_mq_queue_tag_busy_iter blk-mq: init hctx sched after update ctx and hctx mapping block: remove duplicate initialization tracing/blktrace: Fix to allow setting same value pktcdvd: fix setting of 'ret' error return for a few cases block: change return type to bool block, bfq: return nbytes and not zero from struct cftype .write() method block, bfq: improve code of bfq_bfqq_charge_time block, bfq: reduce write overcharge block, bfq: always update the budget of an entity when needed block, bfq: readd missing reset of parent-entity service blk-wbt: fix IO hang in wbt_wait() block: don't warn for flush on read-only device bcache: add the missing comments for smp_mb()/smp_wmb() bcache: remove unnecessary space before ioctl function pointer arguments bcache: add missing SPDX header bcache: move open brace at end of function definitions to next line bcache: add static const prefix to char * array declarations bcache: fix code comments style ...

Linus Torvalds committed 8 years ago

Commit 5bed49a2 parents fe6f0ed 1e7da8643 files · +879 −656Browse files

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

Unified · Split

include/uapi/linux/bcache.h+5−3

@@ -30,10 +30,10 @@ struct bkey { · 29 unmodified lines
30	30	BITMASK(name, struct bkey, field, offset, size)
31	31
32	32	#define PTR_FIELD(name, offset, size) \
33		−static inline __u64 name(const struct bkey *k, unsigned i) \
	33	+static inline __u64 name(const struct bkey *k, unsigned int i) \
34	34	{ return (k->ptr[i] >> offset) & ~(~0ULL << size); } \
35	35	\
36		−static inline void SET_##name(struct bkey *k, unsigned i, __u64 v) \
	36	+static inline void SET_##name(struct bkey *k, unsigned int i, __u64 v) \
37	37	{ \
38	38	k->ptr[i] &= ~(~(~0ULL << size) << offset); \
39	39	k->ptr[i] \|= (v & ~(~0ULL << size)) << offset; \
@@ -117,12 +117,14 @@ static inline void bkey_copy_key(struct bkey dest, const struct bkey src) · 77 unmodified lines
117	117	static inline struct bkey bkey_next(const struct bkey k)
118	118	{
119	119	__u64 d = (void ) k;
	120	+
120	121	return (struct bkey *) (d + bkey_u64s(k));
121	122	}
122	123
123		−static inline struct bkey bkey_idx(const struct bkey k, unsigned nr_keys)
	124	+static inline struct bkey bkey_idx(const struct bkey k, unsigned int nr_keys)
124	125	{
125	126	__u64 d = (void ) k;
	127	+
126	128	return (struct bkey *) (d + nr_keys);
127	129	}
128	130	/* Enough for a key with 6 pointers */