Merge tag 'block-5.13-2021-05-09' of git://git.kernel.dk/linux-block

Pull block fix from Jens Axboe:
 "Turns out the bio max size change still has issues, so let's get it
  reverted for 5.13-rc1. We'll shake out the issues there and defer it
  to 5.14 instead"

* tag 'block-5.13-2021-05-09' of git://git.kernel.dk/linux-block:
  Revert "bio: limit bio max size"

diff --combined block/blk-settings.c
index c6f80e3b8020e4a8833a602c01eb2a07eecf5fa6,9c009090c4b5bf58168564cf62e8d7b08011d08e..902c40d67120251564b1c17529f0557cea76d872
--- 1/block/blk-settings.c
--- 2/block/blk-settings.c
+++ b/block/blk-settings.c
@@@ -7,7 -7,6 +7,7 @@@
  #include <linux/init.h>
  #include <linux/bio.h>
  #include <linux/blkdev.h>
 +#include <linux/pagemap.h>
  #include <linux/gcd.h>
  #include <linux/lcm.h>
  #include <linux/jiffies.h>
@@@ -32,7 -31,6 +32,6 @@@ EXPORT_SYMBOL_GPL(blk_queue_rq_timeout)
   */
  void blk_set_default_limits(struct queue_limits *lim)
  {
-       lim->bio_max_bytes = UINT_MAX;
        lim->max_segments = BLK_MAX_SEGMENTS;
        lim->max_discard_segments = 1;
        lim->max_integrity_segments = 0;
@@@ -141,10 -139,6 +140,6 @@@ void blk_queue_max_hw_sectors(struct re
                                 limits->logical_block_size >> SECTOR_SHIFT);
        limits->max_sectors = max_sectors;
  
-       if (check_shl_overflow(max_sectors, SECTOR_SHIFT,
-                               &limits->bio_max_bytes))
-               limits->bio_max_bytes = UINT_MAX;
- 
        q->backing_dev_info->io_pages = max_sectors >> (PAGE_SHIFT - 9);
  }
  EXPORT_SYMBOL(blk_queue_max_hw_sectors);

diff --combined include/linux/blkdev.h
index 9fb255b48a57ac148578ea21f478d6306da73aca,b91ba6207365b2af4081b67193d13b820da4ba98..1255823b2bc0fff0dcb75535333f809bc886d9c4
--- 1/include/linux/blkdev.h
--- 2/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@@ -11,6 -11,7 +11,6 @@@
  #include <linux/minmax.h>
  #include <linux/timer.h>
  #include <linux/workqueue.h>
 -#include <linux/pagemap.h>
  #include <linux/backing-dev-defs.h>
  #include <linux/wait.h>
  #include <linux/mempool.h>
@@@ -326,8 -327,6 +326,6 @@@ enum blk_bounce 
  };
  
  struct queue_limits {
-       unsigned int            bio_max_bytes;
- 
        enum blk_bounce         bounce;
        unsigned long           seg_boundary_mask;
        unsigned long           virt_boundary_mask;