Merge branch 'sg' of git://git.kernel.dk/linux-2.6-block

* 'sg' of git://git.kernel.dk/linux-2.6-block:
  fix sg_phys to use dma_addr_t
  ub: add sg_init_table for sense and read capacity commands
  x86: pci-gart fix
  blackfin: fix sg fallout
  xtensa: dma-mapping.h is using linux/scatterlist.h functions, so include it
  SG: audit of drivers that use blk_rq_map_sg()
  arch/um/drivers/ubd_kern.c: fix a building error
  SG: Change sg_set_page() to take length and offset argument
  AVR32: Fix sg_page breakage
  mmc: sg fallout
  m68k: sg fallout
  More SG build fixes
  sg: add missing sg_init_table calls to zfcp
  SG build fix

1 files changed, 1 insertions, 3 deletions

diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c
index de5ba479c2..b01dee3ae7 100644
--- a/block/ll_rw_blk.c
+++ b/block/ll_rw_blk.c
@@ -1366,9 +1366,7 @@ new_segment:
                                 sg = sg_next(sg);
                         }
 
-                        sg_set_page(sg, bvec->bv_page);
-                        sg->length = nbytes;
-                        sg->offset = bvec->bv_offset;
+                        sg_set_page(sg, bvec->bv_page, nbytes, bvec->bv_offset);
                         nsegs++;
                 }
                 bvprv = bvec;