Pull block fixes from Jens Axboe: "A small batch of fixes that should be included for the 4.13 release. This contains: - Revert of the 4k loop blocksize support. Even with a recent batch of 4 fixes, we're still not really happy with it. Rather than be stuck with an API issue, let's revert it and get it right for 4.14. - Trivial patch from Bart, adding a few flags to the blk-mq debugfs exports that were added in this release, but not to the debugfs parts. - Regression fix for bsg, fixing a potential kernel panic. From Benjamin. - Tweak for the blk throttling, improving how we account discards. From Shaohua" * 'for-linus' of git://git.kernel.dk/linux-block: blk-mq-debugfs: Add names for recently added flags bsg-lib: fix kernel panic resulting from missing allocation of reply-buffer Revert "loop: support 4k physical blocksize" blk-throttle: cap discard request size
Showing the changes to include/linux (2 of 8 files). Show all
Unified · Split
| @@ -568,7 +568,6 @@ struct request_queue { · 567 unmodified lines | |||
| 568 | 568 | ||
| 569 | #if defined(CONFIG_BLK_DEV_BSG) | 569 | #if defined(CONFIG_BLK_DEV_BSG) |
| 570 | bsg_job_fn *bsg_job_fn; | 570 | bsg_job_fn *bsg_job_fn; |
| 571 | int bsg_job_size; | ||
| 572 | struct bsg_class_device bsg_dev; | 571 | struct bsg_class_device bsg_dev; |
| 573 | #endif | 572 | #endif |
| 574 | 573 | ||
| @@ -24,6 +24,7 @@ · 23 unmodified lines | |||
| 24 | #define _BLK_BSG_ | 24 | #define _BLK_BSG_ |
| 25 | 25 | ||
| 26 | #include <linux/blkdev.h> | 26 | #include <linux/blkdev.h> |
| 27 | #include <scsi/scsi_request.h> | ||
| 27 | 28 | ||
| 28 | struct request; | 29 | struct request; |
| 29 | struct device; | 30 | struct device; |
| @@ -37,6 +38,7 @@ struct bsg_buffer { · 7 unmodified lines | |||
| 37 | }; | 38 | }; |
| 38 | 39 | ||
| 39 | struct bsg_job { | 40 | struct bsg_job { |
| 41 | struct scsi_request sreq; | ||
| 40 | struct device *dev; | 42 | struct device *dev; |
| 41 | struct request *req; | 43 | struct request *req; |
| 42 | 44 | ||