Commit 7c5014b0 authored May 13, 2020 by Martijn Coenen Committed by Jens Axboe May 21, 2020

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>

parent c6516565

drivers/block/loop.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1334,8 +1334,6 @@ loop_set_status(struct loop_device lo, const struct loop_info64 info)
		}
		}

		loop_config_discard(lo);

		memcpy(lo->lo_file_name, info->lo_file_name, LO_NAME_SIZE);
		memcpy(lo->lo_crypt_name, info->lo_crypt_name, LO_NAME_SIZE);
		lo->lo_file_name[LO_NAME_SIZE-1] = 0;
		@@ -1359,6 +1357,8 @@ loop_set_status(struct loop_device lo, const struct loop_info64 info)
		lo->lo_key_owner = uid;
		}

		loop_config_discard(lo);

		/* update dio if lo_offset or transfer is changed */
		__loop_update_dio(lo, lo->use_dio);

Admin message