hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c
kernel/drivers/s390/block/xpram.c
....@@ -182,7 +182,7 @@
182182 /*
183183 * Block device make request function.
184184 */
185
-static blk_qc_t xpram_make_request(struct request_queue *q, struct bio *bio)
185
+static blk_qc_t xpram_submit_bio(struct bio *bio)
186186 {
187187 xpram_device_t *xdev = bio->bi_disk->private_data;
188188 struct bio_vec bvec;
....@@ -191,7 +191,7 @@
191191 unsigned long page_addr;
192192 unsigned long bytes;
193193
194
- blk_queue_split(q, &bio);
194
+ blk_queue_split(&bio);
195195
196196 if ((bio->bi_iter.bi_sector & 7) != 0 ||
197197 (bio->bi_iter.bi_size & 4095) != 0)
....@@ -250,6 +250,7 @@
250250 static const struct block_device_operations xpram_devops =
251251 {
252252 .owner = THIS_MODULE,
253
+ .submit_bio = xpram_submit_bio,
253254 .getgeo = xpram_getgeo,
254255 };
255256
....@@ -343,14 +344,13 @@
343344 xpram_disks[i] = alloc_disk(1);
344345 if (!xpram_disks[i])
345346 goto out;
346
- xpram_queues[i] = blk_alloc_queue(GFP_KERNEL);
347
+ xpram_queues[i] = blk_alloc_queue(NUMA_NO_NODE);
347348 if (!xpram_queues[i]) {
348349 put_disk(xpram_disks[i]);
349350 goto out;
350351 }
351352 blk_queue_flag_set(QUEUE_FLAG_NONROT, xpram_queues[i]);
352353 blk_queue_flag_clear(QUEUE_FLAG_ADD_RANDOM, xpram_queues[i]);
353
- blk_queue_make_request(xpram_queues[i], xpram_make_request);
354354 blk_queue_logical_block_size(xpram_queues[i], 4096);
355355 }
356356