loop: Call loop_config_discard() only after new config is applied.
PATCH 1/1 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.
--- drivers/block/loop.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/block/loop.c +2 -2
@@ -1312,8 +1312,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 ;
@@ -1337,6 +1335,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);
Signature · 1 line
2.26.0.rc2.310.g2932bb562d-goog
Folks, any thoughts about this one?
Thanks,
Martijn
Quoted 37 lines · Martijn Coenen
loop_set_status()callsloop_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 <[email protected]>--- drivers/block/loop.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/block/loop.c +2
-3@@ -1312,8 +1312,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 ;@@ -1337,6 +1335,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); --2.26.0.rc2.310.g2932bb562d-goog
Quoted 7 lines · Martijn Coenen
loop_set_status()callsloop_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 <[email protected]>
Looks good,
Quoted 7 lines · Martijn Coenen
loop_set_status()callsloop_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 <[email protected]>
Looks fine to me.
Quoted 27 lines
--- drivers/block/loop.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/block/loop.c +2
-2@@ -1312,8 +1312,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 ;@@ -1337,6 +1335,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);
Quoted 5 lines · Martijn Coenen
loop_set_status()callsloop_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.
Hi Jens,
Are you ok with this one? One of my later series depends on it, but so far I've kept it separate because it's a bug fix.
Thanks,
Martijn
Quoted 9 lines · Bart Van Assche
Quoted 5 lines · Martijn Coenen
loop_set_status()callsloop_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.Reviewed-by Bart Van Assche <[email protected]>