]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
dm raid: fix discard support regression
authorHeinz Mauelshagen <heinzm@redhat.com>
Tue, 29 Nov 2016 21:37:30 +0000 (22:37 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 6 Jan 2017 10:16:23 +0000 (11:16 +0100)
commitab10ab0a2a3d4ef58209cc51e7bbe6fd5937c024
tree6e8e7c2c0161ecd04c6011e7c15337efd38bd3c8
parent454b98d3f2b57b633e7d4820fc1acbe2096f5166
dm raid: fix discard support regression

commit 11e2968478edc07a75ee1efb45011b3033c621c2 upstream.

Commit ecbfb9f118 ("dm raid: add raid level takeover support") moved the
configure_discard_support() call from raid_ctr() to raid_preresume().

Enabling/disabling discard _must_ happen during table load (through the
.ctr hook).  Fix this regression by moving the
configure_discard_support() call back to raid_ctr().

Fixes: ecbfb9f118 ("dm raid: add raid level takeover support")
Signed-off-by: Heinz Mauelshagen <heinzm@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/md/dm-raid.c