From: Sebastian Andrzej Siewior Date: Fri, 4 May 2018 14:32:45 +0000 (+0200) Subject: block: don't disable interrupts during kmap_atomic() X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=f3a1075e5fc3434f1b7af601180dd976b754ec0c;p=openwrt%2Fstaging%2Fblogic.git 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 1ec9c5ddc17a ("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: Sebastian Andrzej Siewior Signed-off-by: Jens Axboe --- diff --git a/block/bounce.c b/block/bounce.c index dd0b93f2a871..fea9c8146d82 100644 --- a/block/bounce.c +++ b/block/bounce.c @@ -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 */