1 files changed, 4 insertions, 1 deletions

diff --git a/mm/filemap.c b/mm/filemap.c
index 7771871fa353..c0018f2d50e0 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -9,7 +9,7 @@
  * most "normal" filesystems (but you don't /have/ to use this:
  * the NFS filesystem used to do this differently, for example)
  */
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/compiler.h>
 #include <linux/fs.h>
 #include <linux/uaccess.h>
@@ -2115,6 +2115,7 @@ void iov_iter_advance(struct iov_iter *i, size_t bytes)
         } else {
                 const struct iovec *iov = i->iov;
                 size_t base = i->iov_offset;
+                unsigned long nr_segs = i->nr_segs;
 
                 /*
                  * The !iov->iov_len check ensures we skip over unlikely
@@ -2130,11 +2131,13 @@ void iov_iter_advance(struct iov_iter *i, size_t bytes)
                         base += copy;
                         if (iov->iov_len == base) {
                                 iov++;
+                                nr_segs--;
                                 base = 0;
                         }
                 }
                 i->iov = iov;
                 i->iov_offset = base;
+                i->nr_segs = nr_segs;
         }
 }
 EXPORT_SYMBOL(iov_iter_advance);