2 files changed, 8 insertions, 5 deletions

diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c
index 2b889d91e673..28e155a9e2a5 100644
--- a/drivers/ieee1394/sbp2.c
+++ b/drivers/ieee1394/sbp2.c
@@ -1465,10 +1465,9 @@ static void sbp2_prep_command_orb_sg(struct sbp2_command_orb *orb,
         orb->misc |= ORB_SET_DIRECTION(orb_direction);
 
         /* special case if only one element (and less than 64KB in size) */
-        if ((scsi_use_sg == 1) &&
-            (sg_dma_len(sg) <= SBP2_MAX_SG_ELEMENT_LENGTH)) {
+        if (scsi_use_sg == 1 && sg->length <= SBP2_MAX_SG_ELEMENT_LENGTH) {
 
-                cmd->dma_size = sg_dma_len(sg);
+                cmd->dma_size = sg->length;
                 cmd->dma_type = CMD_DMA_PAGE;
                 cmd->cmd_dma = dma_map_page(hi->host->device.parent,
                                             sg_page(sg), sg->offset,
diff --git a/mm/filemap.c b/mm/filemap.c
index 89ce6fe5f8be..76bea88cbebc 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1750,7 +1750,11 @@ static void __iov_iter_advance_iov(struct iov_iter *i, size_t bytes)
                 const struct iovec *iov = i->iov;
                 size_t base = i->iov_offset;
 
-                while (bytes) {
+                /*
+                 * The !iov->iov_len check ensures we skip over unlikely
+                 * zero-length segments.
+                 */
+                while (bytes || !iov->iov_len) {
                         int copy = min(bytes, iov->iov_len - base);
 
                         bytes -= copy;
@@ -2268,6 +2272,7 @@ again:
 
                 cond_resched();
 
+                iov_iter_advance(i, copied);
                 if (unlikely(copied == 0)) {
                         /*
                          * If we were unable to copy any data at all, we must
@@ -2281,7 +2286,6 @@ again:
                                                 iov_iter_single_seg_count(i));
                         goto again;
                 }
-                iov_iter_advance(i, copied);
                 pos += copied;
                 written += copied;