History

Merge branch 'for-linus' of git://git.kernel.dk/linux-block

Pull block layer fixes from Jens Axboe: "Outside of bcache (which really isn't super big), these are all few-liners. There are a few important fixes in here: - Fix blk pm sleeping when holding the queue lock - A small collection of bcache fixes that have been done and tested since bcache was included in this merge window. - A fix for a raid5 regression introduced with the bio changes. - Two important fixes for mtip32xx, fixing an oops and potential data corruption (or hang) due to wrong bio iteration on stacked devices." * 'for-linus' of git://git.kernel.dk/linux-block: scatterlist: sg_set_buf() argument must be in linear mapping raid5: Initialize bi_vcnt pktcdvd: silence static checker warning block: remove refs to XD disks from documentation blkpm: avoid sleep when holding queue lock mtip32xx: Correctly handle bio->bi_idx != 0 conditions mtip32xx: Fix NULL pointer dereference during module unload bcache: Fix error handling in init code bcache: clarify free/available/unused space bcache: drop "select CLOSURES" bcache: Fix incompatible pointer type warning

Linus Torvalds committed 13 years ago

Commit b2cc9c12 parents a568fa1 ac4e97a14 files · +124 −143Browse files

Showing the changes to include (1 of 14 files). Show all

Unified · Split

include/linux/scatterlist.h+3−0
@@ -111,6 +111,9 @@ static inline struct page *sg_page(struct scatterlist *sg) · 110 unmodified lines
111static inline void sg_set_buf(struct scatterlist *sg, const void *buf,111static inline void sg_set_buf(struct scatterlist *sg, const void *buf,
112 unsigned int buflen)112 unsigned int buflen)
113{113{
114#ifdef CONFIG_DEBUG_SG
115 BUG_ON(!virt_addr_valid(buf));
116#endif
114 sg_set_page(sg, virt_to_page(buf), buflen, offset_in_page(buf));117 sg_set_page(sg, virt_to_page(buf), buflen, offset_in_page(buf));
115}118}
116 119