loop: Call loop_config_discard() only after new config is applied
authorMartijn Coenen <maco@android.com>
Wed, 13 May 2020 13:38:35 +0000 (15:38 +0200)
committerJens Axboe <axboe@kernel.dk>
Thu, 21 May 2020 14:20:34 +0000 (08:20 -0600)
commit7c5014b0987a30e4989c90633c198aced454c0ec
treedf5108d743c2c7012c1cf3a14eece7eade05043c
parentc65165651d595fd77c38a9a25c14ade14444bc13
loop: Call loop_config_discard() only after new config is applied

loop_set_status() calls loop_config_discard() to configure discard for
the loop device; however, the discard configuration depends on whether
the loop device uses encryption, and when we call it the encryption
configuration has not been updated yet. Move the call down so we apply
the correct discard configuration based on the new configuration.

Signed-off-by: Martijn Coenen <maco@android.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Bob Liu <bob.liu@oracle.com>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/block/loop.c