diff --git a/[refs] b/[refs]
index 3992776ff222..9e86458b8e25 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a45abd577727d2268e190d372600f8652883453
+refs/heads/master: c5482bbd9607bf38cbc952eacaa429e6ba3160a0
diff --git a/trunk/include/linux/drbd_limits.h b/trunk/include/linux/drbd_limits.h
index c4a8f0fef7b2..8f8bbea545e0 100644
--- a/trunk/include/linux/drbd_limits.h
+++ b/trunk/include/linux/drbd_limits.h
@@ -125,9 +125,10 @@
  * the upper limit with 64bit kernel, enough ram and flexible meta data
  * is 1 PiB, currently. */
 /* DRBD_MAX_SECTORS */
-#define DRBD_DISK_SIZE_SECT_MIN  0
-#define DRBD_DISK_SIZE_SECT_MAX  (1 * (2LLU << 40))
-#define DRBD_DISK_SIZE_SECT_DEF  0 /* = disabled = no user size... */
+#define DRBD_DISK_SIZE_MIN  0
+#define DRBD_DISK_SIZE_MAX  (16 * (2LLU << 30))
+#define DRBD_DISK_SIZE_DEF  0 /* = disabled = no user size... */
+#define DRBD_DISK_SIZE_SCALE 's'  /* sectors */
 
 #define DRBD_ON_IO_ERROR_DEF EP_DETACH
 #define DRBD_FENCING_DEF FP_DONT_CARE