Skip to content

Commit 68d2370

Browse files
mszyprowChristoph Hellwig
authored andcommitted
scatterlist: protect parameters of the sg_table related macros
Add brackets to protect parameters of the recently added sg_table related macros from side-effects. Fixes: 709d6d7 ("scatterlist: add generic wrappers for iterating over sgtable objects") Signed-off-by: Marek Szyprowski <[email protected]> Signed-off-by: Christoph Hellwig <[email protected]>
1 parent 71cdec4 commit 68d2370

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

include/linux/scatterlist.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,15 +155,15 @@ static inline void sg_set_buf(struct scatterlist *sg, const void *buf,
155155
* Loop over each sg element in the given sg_table object.
156156
*/
157157
#define for_each_sgtable_sg(sgt, sg, i) \
158-
for_each_sg(sgt->sgl, sg, sgt->orig_nents, i)
158+
for_each_sg((sgt)->sgl, sg, (sgt)->orig_nents, i)
159159

160160
/*
161161
* Loop over each sg element in the given *DMA mapped* sg_table object.
162162
* Please use sg_dma_address(sg) and sg_dma_len(sg) to extract DMA addresses
163163
* of the each element.
164164
*/
165165
#define for_each_sgtable_dma_sg(sgt, sg, i) \
166-
for_each_sg(sgt->sgl, sg, sgt->nents, i)
166+
for_each_sg((sgt)->sgl, sg, (sgt)->nents, i)
167167

168168
/**
169169
* sg_chain - Chain two sglists together
@@ -451,7 +451,7 @@ sg_page_iter_dma_address(struct sg_dma_page_iter *dma_iter)
451451
* See also for_each_sg_page(). In each loop it operates on PAGE_SIZE unit.
452452
*/
453453
#define for_each_sgtable_page(sgt, piter, pgoffset) \
454-
for_each_sg_page(sgt->sgl, piter, sgt->orig_nents, pgoffset)
454+
for_each_sg_page((sgt)->sgl, piter, (sgt)->orig_nents, pgoffset)
455455

456456
/**
457457
* for_each_sgtable_dma_page - iterate over the DMA mapped sg_table object
@@ -465,7 +465,7 @@ sg_page_iter_dma_address(struct sg_dma_page_iter *dma_iter)
465465
* unit.
466466
*/
467467
#define for_each_sgtable_dma_page(sgt, dma_iter, pgoffset) \
468-
for_each_sg_dma_page(sgt->sgl, dma_iter, sgt->nents, pgoffset)
468+
for_each_sg_dma_page((sgt)->sgl, dma_iter, (sgt)->nents, pgoffset)
469469

470470

471471
/*

0 commit comments

Comments
 (0)