Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8fc45044 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: don't set bounce limit in blk_init_queue 



Instead move it to the callers.  Those that either don't use bio_data() or
page_address() or are specific to architectures that do not support highmem
are skipped.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 0bf6595e

block/blk-core.c

+0 −5
Original line number Diff line number Diff line
@@ -960,11 +960,6 @@ blk_init_queue_node(request_fn_proc *rfn, spinlock_t *lock, int node_id) 
		return NULL;

	}



	/*

	 * by default assume old behaviour and bounce for any highmem page

	 */

	blk_queue_bounce_limit(q, BLK_BOUNCE_HIGH);



	return q;

}

EXPORT_SYMBOL(blk_init_queue_node);

drivers/block/aoe/aoeblk.c

+1 −0
Original line number Diff line number Diff line
@@ -388,6 +388,7 @@ aoeblk_gdalloc(void *vp) 
			d->aoemajor, d->aoeminor);

		goto err_mempool;

	}

	blk_queue_bounce_limit(q, BLK_BOUNCE_HIGH);



	spin_lock_irqsave(&d->lock, flags);

	WARN_ON(!(d->flags & DEVFL_GD_NOW));

drivers/block/floppy.c

+1 −0
Original line number Diff line number Diff line
@@ -4203,6 +4203,7 @@ static int __init do_floppy_init(void) 
			goto out_put_disk;

		}



		blk_queue_bounce_limit(disks[drive]->queue, BLK_BOUNCE_HIGH);

		blk_queue_max_hw_sectors(disks[drive]->queue, 64);

		disks[drive]->major = FLOPPY_MAJOR;

		disks[drive]->first_minor = TOMINOR(drive);

drivers/block/paride/pcd.c

+1 −0
Original line number Diff line number Diff line
@@ -305,6 +305,7 @@ static void pcd_init_units(void) 
			put_disk(disk);

			continue;

		}

		blk_queue_bounce_limit(disk->queue, BLK_BOUNCE_HIGH);

		cd->disk = disk;

		cd->pi = &cd->pia;

		cd->present = 0;

drivers/block/paride/pd.c

+1 −0
Original line number Diff line number Diff line
@@ -863,6 +863,7 @@ static void pd_probe_drive(struct pd_unit *disk) 
		return;

	}

	blk_queue_max_hw_sectors(p->queue, cluster);

	blk_queue_bounce_limit(p->queue, BLK_BOUNCE_HIGH);



	if (disk->drive == -1) {

		for (disk->drive = 0; disk->drive <= 1; disk->drive++)