diff options
| author |   Martin K. Petersen <martin.petersen@oracle.com> | 2019-06-27 00:19:33 -0400 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2019-06-27 00:19:33 -0400 |
| commit | 893ca250edfcd0489a49446048aa0d900d6862fc (patch) | |
| tree | 834bd18586b204cce9177a8ba6f8f273f8fa1956 /include | |
| parent | scsi: qla2xxx: move IO flush to the front of NVME rport unregistration (diff) | |
| parent | scsi: core: don't preallocate small SGL in case of NO_SG_CHAIN (diff) | |
| download | linux-dev-893ca250edfcd0489a49446048aa0d900d6862fc.tar.xz linux-dev-893ca250edfcd0489a49446048aa0d900d6862fc.zip | |
Merge branch '5.3/scsi-sg' into scsi-next
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/scatterlist.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/include/linux/scatterlist.h b/include/linux/scatterlist.h index 30a9a55c28ba..6eec50fb36c8 100644 --- a/include/linux/scatterlist.h +++ b/include/linux/scatterlist.h @@ -266,10 +266,11 @@ int sg_split(struct scatterlist *in, const int in_mapped_nents, typedef struct scatterlist *(sg_alloc_fn)(unsigned int, gfp_t); typedef void (sg_free_fn)(struct scatterlist *, unsigned int); -void __sg_free_table(struct sg_table *, unsigned int, bool, sg_free_fn *); +void __sg_free_table(struct sg_table *, unsigned int, unsigned int, + sg_free_fn *); void sg_free_table(struct sg_table *); int __sg_alloc_table(struct sg_table *, unsigned int, unsigned int, - struct scatterlist *, gfp_t, sg_alloc_fn *); + struct scatterlist *, unsigned int, gfp_t, sg_alloc_fn *); int sg_alloc_table(struct sg_table *, unsigned int, gfp_t); int __sg_alloc_table_from_pages(struct sg_table *sgt, struct page **pages, unsigned int n_pages, unsigned int offset, @@ -331,9 +332,11 @@ size_t sg_zero_buffer(struct scatterlist *sgl, unsigned int nents, #endif #ifdef CONFIG_SG_POOL -void sg_free_table_chained(struct sg_table *table, bool first_chunk); +void sg_free_table_chained(struct sg_table *table, + unsigned nents_first_chunk); int sg_alloc_table_chained(struct sg_table *table, int nents, - struct scatterlist *first_chunk); + struct scatterlist *first_chunk, + unsigned nents_first_chunk); #endif /* |