diff options
| author | Philipp Reisner <philipp.reisner@linbit.com> | 2011-05-31 07:07:24 -0400 |
|---|---|---|
| committer | Philipp Reisner <philipp.reisner@linbit.com> | 2012-11-08 10:57:49 -0500 |
| commit | d942ae44537669418a7cbfd916531d30513dbca8 (patch) | |
| tree | b5828318e7ffe375b3d709c634c3430292d9f376 /include/linux/drbd_limits.h | |
| parent | 4dbdae3ec9c75f570e2f128fd25b49ff1fa2a4de (diff) | |
drbd: Fixes from the 8.3 development branch
* commit 'ae57a0a':
drbd: Only print sanitize state's warnings, if the state change happens
drbd: we should write meta data updates with FLUSH FUA
drbd: fix limit define, we support 1 PiByte now
drbd: fix log message argument order
drbd: Typo in user-visible message.
drbd: Make "(rcv|snd)buf-size" and "ping-timeout" available for the proxy, too.
drbd: Allow keywords to be used in multiple config sections.
drbd: fix typos in comments.
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'include/linux/drbd_limits.h')
| -rw-r--r-- | include/linux/drbd_limits.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/drbd_limits.h b/include/linux/drbd_limits.h index 82db83410f08..f1046b13d9f6 100644 --- a/include/linux/drbd_limits.h +++ b/include/linux/drbd_limits.h | |||
| @@ -126,7 +126,7 @@ | |||
| 126 | * is 1 PiB, currently. */ | 126 | * is 1 PiB, currently. */ |
| 127 | /* DRBD_MAX_SECTORS */ | 127 | /* DRBD_MAX_SECTORS */ |
| 128 | #define DRBD_DISK_SIZE_MIN 0 | 128 | #define DRBD_DISK_SIZE_MIN 0 |
| 129 | #define DRBD_DISK_SIZE_MAX (16 * (2LLU << 30)) | 129 | #define DRBD_DISK_SIZE_MAX (1 * (2LLU << 40)) |
| 130 | #define DRBD_DISK_SIZE_DEF 0 /* = disabled = no user size... */ | 130 | #define DRBD_DISK_SIZE_DEF 0 /* = disabled = no user size... */ |
| 131 | #define DRBD_DISK_SIZE_SCALE 's' /* sectors */ | 131 | #define DRBD_DISK_SIZE_SCALE 's' /* sectors */ |
| 132 | 132 | ||