drbd: fix check for too large lower level device

To check wether we are truncating a very large device due to limited
meta data space, we need to check the ll_dev size.

Also improve the printk to suggest "flexible" or "internal".

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>

diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index 22538d9628f11dfeb57dced35cde611f97783bb0..e2a5875a07b1cbd181046913627b25ba409c5e9f 100644 (file)
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
@@ -894,11 +894,6 @@ static int drbd_nl_disk_conf(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp
                min_md_device_sectors = MD_RESERVED_SECT * (nbc->dc.meta_dev_idx + 1);
        }
 
-       if (drbd_get_capacity(nbc->md_bdev) > max_possible_sectors)
-               dev_warn(DEV, "truncating very big lower level device "
-                    "to currently maximum possible %llu sectors\n",
-                    (unsigned long long) max_possible_sectors);
-
        if (drbd_get_capacity(nbc->md_bdev) < min_md_device_sectors) {
                retcode = ERR_MD_DISK_TO_SMALL;
                dev_warn(DEV, "refusing attach: md-device too small, "
@@ -917,6 +912,15 @@ static int drbd_nl_disk_conf(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp
 
        nbc->known_size = drbd_get_capacity(nbc->backing_bdev);
 
+       if (nbc->known_size > max_possible_sectors) {
+               dev_warn(DEV, "==> truncating very big lower level device "
+                       "to currently maximum possible %llu sectors <==\n",
+                       (unsigned long long) max_possible_sectors);
+               if (nbc->dc.meta_dev_idx >= 0)
+                       dev_warn(DEV, "==>> using internal or flexible "
+                                     "meta data may help <<==\n");
+       }
+
        drbd_suspend_io(mdev);
        /* also wait for the last barrier ack. */
        wait_event(mdev->misc_wait, !atomic_read(&mdev->ap_pending_cnt));