diff options
author | Gilad Ben-Yossef <gilad@benyossef.com> | 2017-02-27 17:28:29 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-27 21:43:46 -0500 |
commit | d31712009709774506e536a3cc1f7c512f550a0c (patch) | |
tree | 585ef4a193d63365b9108e414afe146665559988 | |
parent | 1d5210ef706523529d3cc16fd70be0a466253466 (diff) |
scatterlist: do not disable IRQs in sg_copy_buffer
Commit 50bed2e2862a ("sg: disable interrupts inside sg_copy_buffer")
introduced disabling interrupts in sg_copy_buffer() since atomic uses of
miter required it due to use of kmap_atomic().
However, as commit 8290e2d2dcbf ("scatterlist: atomic sg_mapping_iter()
no longer needs disabled IRQs") acknowledges disabling interrupts is no
longer needed for calls to kmap_atomic() and therefore unneeded for
miter ops either, so remove it from sg_copy_buffer().
Link: http://lkml.kernel.org/r/1486040150-14109-3-git-send-email-gilad@benyossef.com
Signed-off-by: Gilad Ben-Yossef <gilad@benyossef.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: <ofir.drang@arm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | lib/scatterlist.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/scatterlist.c b/lib/scatterlist.c index 393920fddcb9..c6cf82242d65 100644 --- a/lib/scatterlist.c +++ b/lib/scatterlist.c | |||
@@ -651,7 +651,6 @@ size_t sg_copy_buffer(struct scatterlist *sgl, unsigned int nents, void *buf, | |||
651 | { | 651 | { |
652 | unsigned int offset = 0; | 652 | unsigned int offset = 0; |
653 | struct sg_mapping_iter miter; | 653 | struct sg_mapping_iter miter; |
654 | unsigned long flags; | ||
655 | unsigned int sg_flags = SG_MITER_ATOMIC; | 654 | unsigned int sg_flags = SG_MITER_ATOMIC; |
656 | 655 | ||
657 | if (to_buffer) | 656 | if (to_buffer) |
@@ -664,8 +663,6 @@ size_t sg_copy_buffer(struct scatterlist *sgl, unsigned int nents, void *buf, | |||
664 | if (!sg_miter_skip(&miter, skip)) | 663 | if (!sg_miter_skip(&miter, skip)) |
665 | return false; | 664 | return false; |
666 | 665 | ||
667 | local_irq_save(flags); | ||
668 | |||
669 | while ((offset < buflen) && sg_miter_next(&miter)) { | 666 | while ((offset < buflen) && sg_miter_next(&miter)) { |
670 | unsigned int len; | 667 | unsigned int len; |
671 | 668 | ||
@@ -681,7 +678,6 @@ size_t sg_copy_buffer(struct scatterlist *sgl, unsigned int nents, void *buf, | |||
681 | 678 | ||
682 | sg_miter_stop(&miter); | 679 | sg_miter_stop(&miter); |
683 | 680 | ||
684 | local_irq_restore(flags); | ||
685 | return offset; | 681 | return offset; |
686 | } | 682 | } |
687 | EXPORT_SYMBOL(sg_copy_buffer); | 683 | EXPORT_SYMBOL(sg_copy_buffer); |