diff options
| author | Jens Axboe <jaxboe@fusionio.com> | 2011-06-30 04:10:50 -0400 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2011-06-30 04:10:50 -0400 |
| commit | 7b28afe01ab6ffb5f152f47831b44933facd2328 (patch) | |
| tree | a537d78f49fa1b959c9a453f459c1acd767a939f /include/linux | |
| parent | 726e99ab88db059fe1422e15376ae404f8c66eb4 (diff) | |
| parent | 86e1e98e5c6b4edab97e2b058466ef553cfd878e (diff) | |
Merge branch 'for-3.0-important' of git://git.drbd.org/linux-2.6-drbd into for-linus
Diffstat (limited to 'include/linux')
| -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 @@ | |||
| 117 | /* drbdsetup XY resize -d Z | 117 | /* drbdsetup XY resize -d Z |
| 118 | * you are free to reduce the device size to nothing, if you want to. | 118 | * you are free to reduce the device size to nothing, if you want to. |
| 119 | * the upper limit with 64bit kernel, enough ram and flexible meta data | 119 | * the upper limit with 64bit kernel, enough ram and flexible meta data |
| 120 | * is 16 TB, currently. */ | 120 | * is 1 PiB, currently. */ |
| 121 | /* DRBD_MAX_SECTORS */ | 121 | /* DRBD_MAX_SECTORS */ |
| 122 | #define DRBD_DISK_SIZE_SECT_MIN 0 | 122 | #define DRBD_DISK_SIZE_SECT_MIN 0 |
| 123 | #define DRBD_DISK_SIZE_SECT_MAX (16 * (2LLU << 30)) | 123 | #define DRBD_DISK_SIZE_SECT_MAX (1 * (2LLU << 40)) |
| 124 | #define DRBD_DISK_SIZE_SECT_DEF 0 /* = disabled = no user size... */ | 124 | #define DRBD_DISK_SIZE_SECT_DEF 0 /* = disabled = no user size... */ |
| 125 | 125 | ||
| 126 | #define DRBD_ON_IO_ERROR_DEF EP_PASS_ON | 126 | #define DRBD_ON_IO_ERROR_DEF EP_PASS_ON |