* 'for-linus' of git://git.kernel.dk/linux-block: block: Use hlist_entry() for io_context.cic_list.first cfq-iosched: Remove bogus check in queue_fail path xen/blkback: potential null dereference in error handling xen/blkback: don't call vbd_size() if bd_disk is NULL block: blkdev_get() should access ->bd_disk only after success CFQ: Fix typo and remove unnecessary semicolon block: remove unwanted semicolons Revert "block: Remove extra discard_alignment from hd_struct." nbd: adjust 'max_part' according to part_shift nbd: limit module parameters to a sane value nbd: pass MSG_* flags to kernel_recvmsg() block: improve the bio_add_page() and bio_add_pc_page() descriptions
Showing the changes to include (2 of 9 files). Show all
Unified · Split
| @@ -1282,8 +1282,8 @@ queue_max_integrity_segments(struct request_queue *q) · 1281 unmodified lines | |||
| 1282 | #define blk_get_integrity(a) (0) | 1282 | #define blk_get_integrity(a) (0) |
| 1283 | #define blk_integrity_compare(a, b) (0) | 1283 | #define blk_integrity_compare(a, b) (0) |
| 1284 | #define blk_integrity_register(a, b) (0) | 1284 | #define blk_integrity_register(a, b) (0) |
| 1285 | #define blk_integrity_unregister(a) do { } while (0); | 1285 | #define blk_integrity_unregister(a) do { } while (0) |
| 1286 | #define blk_queue_max_integrity_segments(a, b) do { } while (0); | 1286 | #define blk_queue_max_integrity_segments(a, b) do { } while (0) |
| 1287 | #define queue_max_integrity_segments(a) (0) | 1287 | #define queue_max_integrity_segments(a) (0) |
| 1288 | #define blk_integrity_merge_rq(a, b, c) (0) | 1288 | #define blk_integrity_merge_rq(a, b, c) (0) |
| 1289 | #define blk_integrity_merge_bio(a, b, c) (0) | 1289 | #define blk_integrity_merge_bio(a, b, c) (0) |
| @@ -100,6 +100,7 @@ struct hd_struct { · 99 unmodified lines | |||
| 100 | sector_t start_sect; | 100 | sector_t start_sect; |
| 101 | sector_t nr_sects; | 101 | sector_t nr_sects; |
| 102 | sector_t alignment_offset; | 102 | sector_t alignment_offset; |
| 103 | unsigned int discard_alignment; | ||
| 103 | struct device __dev; | 104 | struct device __dev; |
| 104 | struct kobject *holder_dir; | 105 | struct kobject *holder_dir; |
| 105 | int policy, partno; | 106 | int policy, partno; |