| Message ID | 20180504143247.5240-1-bigeasy@linutronix.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 5/4/18 8:32 AM, Sebastian Andrzej Siewior wrote: > 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. All three patches look fine to me, I'll queue them up for 4.18. In the future, please include a cover letter for block patches when sending > 1 patch. Makes it easier to reply to the series as a whole.
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 */
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 <bigeasy@linutronix.de> --- block/bounce.c | 3 --- 1 file changed, 3 deletions(-)