@@ -951,13 +951,13 @@ static inline void kiblnd_dma_unmap_sg(struct ib_device *dev,
static inline u64 kiblnd_sg_dma_address(struct ib_device *dev,
struct scatterlist *sg)
{
- return ib_sg_dma_address(dev, sg);
+ return sg_dma_address(sg);
}
static inline unsigned int kiblnd_sg_dma_len(struct ib_device *dev,
struct scatterlist *sg)
{
- return ib_sg_dma_len(dev, sg);
+ return sg_dma_len(sg);
}
/* XXX We use KIBLND_CONN_PARAM(e) as writable buffer, it's not strictly */
@@ -829,7 +829,7 @@ int cfs_tracefile_dump_all_pages(char *filename)
goto close;
}
__oldfs = get_fs();
- set_fs(get_ds());
+ set_fs(KERNEL_DS);
/* ok, for now, just write the pages. in the future we'll be building
* iobufs with the pages and calling generic_direct_IO
ib_sg_dma_address(), ib_sg_dma_len(), and get_ds() were simple wrappers that are no longer provided, so replace them with the code they were wrapping. Signed-off-by: NeilBrown <neilb@suse.com> --- .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h | 4 ++-- drivers/staging/lustre/lnet/libcfs/tracefile.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)