diff options
| author | Ming Lei | 2016-05-30 15:34:35 +0200 |
|---|---|---|
| committer | Jens Axboe | 2016-06-09 18:04:08 +0200 |
| commit | 8bf223c22254aac0111e06020d0e3c3098a9e57b (patch) | |
| tree | 6d2af69a466c92c916d79a75dd7f0f48968dbe1b /drivers/block/drbd | |
| parent | block: bio: remove BIO_MAX_SECTORS (diff) | |
| download | kernel-qcow2-linux-8bf223c22254aac0111e06020d0e3c3098a9e57b.tar.gz kernel-qcow2-linux-8bf223c22254aac0111e06020d0e3c3098a9e57b.tar.xz kernel-qcow2-linux-8bf223c22254aac0111e06020d0e3c3098a9e57b.zip | |
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>
Diffstat (limited to 'drivers/block/drbd')
| -rw-r--r-- | drivers/block/drbd/drbd_int.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h index 33f0b827757d..a64c645b4184 100644 --- a/drivers/block/drbd/drbd_int.h +++ b/drivers/block/drbd/drbd_int.h @@ -1327,14 +1327,14 @@ struct bm_extent { #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. * Since we may live in a mixed-platform cluster, * we limit us to a platform agnostic constant here for now. * A followup commit may allow even bigger BIO sizes, * once we thought that through. */ #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 #endif #define DRBD_MAX_BIO_SIZE_SAFE (1U << 12) /* Works always = 4k */ |