Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

[firefly-linux-kernel-4.4.55.git] / drivers / block / drbd / drbd_nl.c

diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index 74df8cfad414f7242a1354c4c34fd4d8273d74ca..e80cbefbc2b548761fe5f531773b1022a21353eb 100644 (file)
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
@@ -1156,14 +1156,14 @@ static void drbd_setup_queue_param(struct drbd_device *device, struct drbd_backi
                        /* For now, don't allow more than one activity log extent worth of data
                         * to be discarded in one go. We may need to rework drbd_al_begin_io()
                         * to allow for even larger discard ranges */
-                       q->limits.max_discard_sectors = DRBD_MAX_DISCARD_SECTORS;
+                       blk_queue_max_discard_sectors(q, DRBD_MAX_DISCARD_SECTORS);
 
                        queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, q);
                        /* REALLY? Is stacking secdiscard "legal"? */
                        if (blk_queue_secdiscard(b))
                                queue_flag_set_unlocked(QUEUE_FLAG_SECDISCARD, q);
                } else {
-                       q->limits.max_discard_sectors = 0;
+                       blk_queue_max_discard_sectors(q, 0);
                        queue_flag_clear_unlocked(QUEUE_FLAG_DISCARD, q);
                        queue_flag_clear_unlocked(QUEUE_FLAG_SECDISCARD, q);
                }