Merge branch 'linus' into smp/hotplug

Apply upstream changes to avoid conflicts with pending patches.

1 files changed, 2 insertions, 1 deletions

diff --git a/include/linux/bvec.h b/include/linux/bvec.h
index 701b64a3b7c5..89b65b82d98f 100644
--- a/include/linux/bvec.h
+++ b/include/linux/bvec.h
@@ -74,7 +74,8 @@ static inline void bvec_iter_advance(const struct bio_vec *bv,
                   "Attempted to advance past end of bvec iter\n");
 
         while (bytes) {
-                unsigned len = min(bytes, bvec_iter_len(bv, *iter));
+                unsigned iter_len = bvec_iter_len(bv, *iter);
+                unsigned len = min(bytes, iter_len);
 
                 bytes -= len;
                 iter->bi_size -= len;