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

Commit f3a1075e authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Jens Axboe
Browse files

block: don't disable interrupts during kmap_atomic() 



bounce_copy_vec() disables interrupts around kmap_atomic(). This is a
leftover from the old kmap_atomic() implementation which relied on fixed
mapping slots, so the caller had to make sure that the same slot could not
be reused from an interrupting context.

kmap_atomic() was changed to dynamic slots long ago and commit 1ec9c5dd
("include/linux/highmem.h: remove the second argument of k[un]map_atomic()")
removed the slot assignements, but the callers were not checked for now
redundant interrupt disabling.

Remove the conditional interrupt disable.

Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent f142f08b

block/bounce.c

+0 −3
Original line number Diff line number Diff line
@@ -63,14 +63,11 @@ __initcall(init_emergency_pool); 
 */

static void bounce_copy_vec(struct bio_vec *to, unsigned char *vfrom)

{

	unsigned long flags;

	unsigned char *vto;



	local_irq_save(flags);

	vto = kmap_atomic(to->bv_page);

	memcpy(vto + to->bv_offset, vfrom, to->bv_len);

	kunmap_atomic(vto);

	local_irq_restore(flags);

}



#else /* CONFIG_HIGHMEM */