Merge tag 'v6.6-rc4' into perf/core, to pick up fixes

[linux.git] / block / blk-map.c

diff --git a/block/blk-map.c b/block/blk-map.c
index 44d74a30ddac042ec29c2b6880724c3156fd49d8..8584babf3ea0ca2590f30383b9594231266e9437 100644 (file)
--- a/block/blk-map.c
+++ b/block/blk-map.c
@@ -315,12 +315,11 @@ static int bio_map_user_iov(struct request *rq, struct iov_iter *iter,
                                        n = bytes;
 
                                if (!bio_add_hw_page(rq->q, bio, page, n, offs,
-                                                    max_sectors, &same_page)) {
-                                       if (same_page)
-                                               bio_release_page(bio, page);
+                                                    max_sectors, &same_page))
                                        break;
-                               }
 
+                               if (same_page)
+                                       bio_release_page(bio, page);
                                bytes -= n;
                                offs = 0;
                        }