Sfoglia il codice sorgente

block: drbd: avoid to use BIO_MAX_SIZE

Use BIO_MAX_PAGES instead and we will remove BIO_MAX_SIZE.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Ming Lei <ming.lei@canonical.com>
Tested-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Ming Lei 9 anni fa
parent
commit
8bf223c222
1 ha cambiato i file con 2 aggiunte e 2 eliminazioni
  1. 2 2
      drivers/block/drbd/drbd_int.h

+ 2 - 2
drivers/block/drbd/drbd_int.h

@@ -1327,14 +1327,14 @@ struct bm_extent {
 #endif
 #endif
 #endif
 #endif
 
 
-/* BIO_MAX_SIZE is 256 * PAGE_SIZE,
+/* Estimate max bio size as 256 * PAGE_SIZE,
  * so for typical PAGE_SIZE of 4k, that is (1<<20) Byte.
  * so for typical PAGE_SIZE of 4k, that is (1<<20) Byte.
  * Since we may live in a mixed-platform cluster,
  * Since we may live in a mixed-platform cluster,
  * we limit us to a platform agnostic constant here for now.
  * we limit us to a platform agnostic constant here for now.
  * A followup commit may allow even bigger BIO sizes,
  * A followup commit may allow even bigger BIO sizes,
  * once we thought that through. */
  * once we thought that through. */
 #define DRBD_MAX_BIO_SIZE (1U << 20)
 #define DRBD_MAX_BIO_SIZE (1U << 20)
-#if DRBD_MAX_BIO_SIZE > BIO_MAX_SIZE
+#if DRBD_MAX_BIO_SIZE > (BIO_MAX_PAGES << PAGE_SHIFT)
 #error Architecture not supported: DRBD_MAX_BIO_SIZE > BIO_MAX_SIZE
 #error Architecture not supported: DRBD_MAX_BIO_SIZE > BIO_MAX_SIZE
 #endif
 #endif
 #define DRBD_MAX_BIO_SIZE_SAFE (1U << 12)       /* Works always = 4k */
 #define DRBD_MAX_BIO_SIZE_SAFE (1U << 12)       /* Works always = 4k */