On Tue, May 10, 2016 at 05:14:57PM -0700, Bart Van Assche wrote: > The SRP initiator allows to set max_sectors to a value that exceeds > the largest amount of data that can be mapped at once with an mlx4 > HCA using fast registration and a page size of 4 KB. Hence modify > ib_map_mr_sg() such that it can map partial sg-elements. If an > sg-element has been mapped partially, let the caller know > which fraction has been mapped by adjusting *sg_offset. > > Signed-off-by: Bart Van Assche <bart.vanassche@xxxxxxxxxxx> > Cc: Christoph Hellwig <hch@xxxxxx> > Cc: Sagi Grimberg <sagi@xxxxxxxxxxx> > Cc: Laurence Oberman <loberman@xxxxxxxxxx> > --- > --- a/drivers/infiniband/hw/mlx5/mr.c > +++ b/drivers/infiniband/hw/mlx5/mr.c > @@ -1752,10 +1752,11 @@ static int > mlx5_ib_sg_to_klms(struct mlx5_ib_mr *mr, > struct scatterlist *sgl, > unsigned short sg_nents, > - unsigned int sg_offset) > + unsigned int *sg_offset_p) > { I wonder on which tree are you basing? In Linus (4.6-rc7) the function signature is different [1], the same goes for my tree and Doug's for-4.7 branch [2]. [1] https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/drivers/infiniband/hw/mlx5/mr.c#n1752 [2] https://github.com/dledford/linux/blob/k.o/for-4.7/drivers/infiniband/hw/mlx5/mr.c#L1752
Attachment:
signature.asc
Description: Digital signature