diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-07 13:22:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-07 13:22:26 -0700 |
| commit | 2a9d6df425d7b46b23cbc8673b2dfefa4678abdb (patch) | |
| tree | a6ec2ee125a3c02342b48a2e4a36598c26ca2b8b /include | |
| parent | c902ce1bfb40d8b049bd2319b388b4b68b04bc27 (diff) | |
| parent | 7b28afe01ab6ffb5f152f47831b44933facd2328 (diff) | |
| download | linux-2a9d6df425d7b46b23cbc8673b2dfefa4678abdb.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
* 'for-linus' of git://git.kernel.dk/linux-block:
drbd: we should write meta data updates with FLUSH FUA
drbd: fix limit define, we support 1 PiByte now
drbd: when receive times out on meta socket, also check last receive time on data socket
drbd: account bitmap IO during resync as resync-(related-)-io
drbd: don't cond_resched_lock with IRQs disabled
drbd: add missing spinlock to bitmap receive
drbd: Use the correct max_bio_size when creating resync requests
cfq-iosched: make code consistent
cfq-iosched: fix a rcu warning
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/drbd_limits.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/drbd_limits.h b/include/linux/drbd_limits.h index 246f576c981d..447c36752385 100644 --- a/include/linux/drbd_limits.h +++ b/include/linux/drbd_limits.h @@ -117,10 +117,10 @@ /* drbdsetup XY resize -d Z * you are free to reduce the device size to nothing, if you want to. * the upper limit with 64bit kernel, enough ram and flexible meta data - * is 16 TB, currently. */ + * is 1 PiB, currently. */ /* DRBD_MAX_SECTORS */ #define DRBD_DISK_SIZE_SECT_MIN 0 -#define DRBD_DISK_SIZE_SECT_MAX (16 * (2LLU << 30)) +#define DRBD_DISK_SIZE_SECT_MAX (1 * (2LLU << 40)) #define DRBD_DISK_SIZE_SECT_DEF 0 /* = disabled = no user size... */ #define DRBD_ON_IO_ERROR_DEF EP_PASS_ON |