Pull block driver updates from Jens Axboe: - mtip32xx pci cleanups (Bjorn) - mtip32xx conversion to generic power management (Vaibhav) - rsxx pci powermanagement cleanups (Bjorn) - Remove the rsxx driver. This hardware never saw much adoption, and it's been end of lifed for a while. (Christoph) - MD pull request from Song: - REQ_NOWAIT support (Vishal Verma) - raid6 benchmark optimization (Dirk Müller) - Fix for acct bioset (Xiao Ni) - Clean up max_queued_requests (Mariusz Tkaczyk) - PREEMPT_RT optimization (Davidlohr Bueso) - Use default_groups in kobj_type (Greg Kroah-Hartman) - Use attribute groups in pktcdvd and rnbd (Greg) - NVMe pull request from Christoph: - increment request genctr on completion (Keith Busch, Geliang Tang) - add a 'iopolicy' module parameter (Hannes Reinecke) - print out valid arguments when reading from /dev/nvme-fabrics (Hannes Reinecke) - Use struct_group() in drbd (Kees) - null_blk fixes (Ming) - Get rid of congestion logic in pktcdvd (Neil) - Floppy ejection hang fix (Tasos) - Floppy max user request size fix (Xiongwei) - Loop locking fix (Tetsuo) * tag 'for-5.17/drivers-2022-01-11' of git://git.kernel.dk/linux-block: (32 commits) md: use default_groups in kobj_type md: Move alloc/free acct bioset in to personality lib/raid6: Use strict priority ranking for pq gen() benchmarking lib/raid6: skip benchmark of non-chosen xor_syndrome functions md: fix spelling of "its" md: raid456 add nowait support md: raid10 add nowait support md: raid1 add nowait support md: add support for REQ_NOWAIT md: drop queue limitation for RAID1 and RAID10 md/raid5: play nice with PREEMPT_RT block/rnbd-clt-sysfs: use default_groups in kobj_type pktcdvd: convert to use attribute groups block: null_blk: only set set->nr_maps as 3 if active poll_queues is > 0 nvme: add 'iopolicy' module parameter nvme: drop unused variable ctrl in nvme_setup_cmd nvme: increment request genctr on completion nvme-fabrics: print out valid arguments when reading from /dev/nvme-fabrics block: remove the rsxx driver rsxx: Drop PCI legacy power management ...
Showing the changes to include (2 of 40 files). Show all
Unified · Split
| @@ -152,14 +152,6 @@ struct packet_stacked_data · 151 unmodified lines | |||
| 152 | }; | 152 | }; |
| 153 | #define PSD_POOL_SIZE 64 | 153 | #define PSD_POOL_SIZE 64 |
| 154 | 154 | ||
| 155 | struct pktcdvd_kobj | ||
| 156 | { | ||
| 157 | struct kobject kobj; | ||
| 158 | struct pktcdvd_device *pd; | ||
| 159 | }; | ||
| 160 | #define to_pktcdvdkobj(_k) \ | ||
| 161 | ((struct pktcdvd_kobj*)container_of(_k,struct pktcdvd_kobj,kobj)) | ||
| 162 | |||
| 163 | struct pktcdvd_device | 155 | struct pktcdvd_device |
| 164 | { | 156 | { |
| 165 | struct block_device *bdev; /* dev attached */ | 157 | struct block_device *bdev; /* dev attached */ |
| @@ -183,6 +175,8 @@ struct pktcdvd_device · 17 unmodified lines | |||
| 183 | spinlock_t lock; /* Serialize access to bio_queue */ | 175 | spinlock_t lock; /* Serialize access to bio_queue */ |
| 184 | struct rb_root bio_queue; /* Work queue of bios we need to handle */ | 176 | struct rb_root bio_queue; /* Work queue of bios we need to handle */ |
| 185 | int bio_queue_size; /* Number of nodes in bio_queue */ | 177 | int bio_queue_size; /* Number of nodes in bio_queue */ |
| 178 | bool congested; /* Someone is waiting for bio_queue_size | ||
| 179 | * to drop. */ | ||
| 186 | sector_t current_sector; /* Keep track of where the elevator is */ | 180 | sector_t current_sector; /* Keep track of where the elevator is */ |
| 187 | atomic_t scan_queue; /* Set to non-zero when pkt_handle_queue */ | 181 | atomic_t scan_queue; /* Set to non-zero when pkt_handle_queue */ |
| 188 | /* needs to be run. */ | 182 | /* needs to be run. */ |
| @@ -195,8 +189,6 @@ struct pktcdvd_device · 6 unmodified lines | |||
| 195 | int write_congestion_on; | 189 | int write_congestion_on; |
| 196 | 190 | ||
| 197 | struct device *dev; /* sysfs pktcdvd[0-7] dev */ | 191 | struct device *dev; /* sysfs pktcdvd[0-7] dev */ |
| 198 | struct pktcdvd_kobj *kobj_stat; /* sysfs pktcdvd[0-7]/stat/ */ | ||
| 199 | struct pktcdvd_kobj *kobj_wqueue; /* sysfs pktcdvd[0-7]/write_queue/ */ | ||
| 200 | 192 | ||
| 201 | struct dentry *dfs_d_root; /* debugfs: devname directory */ | 193 | struct dentry *dfs_d_root; /* debugfs: devname directory */ |
| 202 | struct dentry *dfs_f_info; /* debugfs: info file */ | 194 | struct dentry *dfs_f_info; /* debugfs: info file */ |
| @@ -81,7 +81,7 @@ struct raid6_calls { · 80 unmodified lines | |||
| 81 | void (*xor_syndrome)(int, int, int, size_t, void **); | 81 | void (*xor_syndrome)(int, int, int, size_t, void **); |
| 82 | int (*valid)(void); /* Returns 1 if this routine set is usable */ | 82 | int (*valid)(void); /* Returns 1 if this routine set is usable */ |
| 83 | const char *name; /* Name of this routine set */ | 83 | const char *name; /* Name of this routine set */ |
| 84 | int prefer; /* Has special performance attribute */ | 84 | int priority; /* Relative priority ranking if non-zero */ |
| 85 | }; | 85 | }; |
| 86 | 86 | ||
| 87 | /* Selected algorithm */ | 87 | /* Selected algorithm */ |