dm-flakey: Fix corrupt_bio_byte setup checks
PATCH 1/1 dm-flakey: Fix corrupt_bio_byte setup checks
Fix the error_reads mode - it's incompatible with corrupt_bio_byte, but that's only enabled if corrupt_bio_byte is nonzero.
--- drivers/md/dm-flakey.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/md/dm-flakey.c +6 -3
@@ -215,16 +215,19 @@ static int parse_features(struct dm_arg_set *as, struct flakey_c *fc, }if (test_bit (DROP_WRITES , &fc->flags) && - (fc->corrupt_bio_rw ==WRITE || fc->random_write_corrupt)) { + ((fc->corrupt_bio_byte && fc->corrupt_bio_rw ==WRITE ) || + fc->random_write_corrupt)) { ti->error ="drop_writes is incompatible with random_write_corrupt or corrupt_bio_byte with the WRITE flag set" ;return -EINVAL ; }else if (test_bit (ERROR_WRITES , &fc->flags) && - (fc->corrupt_bio_rw ==WRITE || fc->random_write_corrupt)) { + ((fc->corrupt_bio_byte && fc->corrupt_bio_rw ==WRITE ) || + fc->random_write_corrupt)) { ti->error ="error_writes is incompatible with random_write_corrupt or corrupt_bio_byte with the WRITE flag set" ;return -EINVAL ; }else if (test_bit (ERROR_READS , &fc->flags) && - (fc->corrupt_bio_rw ==READ || fc->random_read_corrupt)) { + ((fc->corrupt_bio_byte && fc->corrupt_bio_rw ==READ ) || + fc->random_read_corrupt)) { ti->error ="error_reads is incompatible with random_read_corrupt or corrupt_bio_byte with the READ flag set" ;return -EINVAL ; }
Signature · 1 line
2.49.0
Quoted 8 lines · Kent Overstreet
Fix the
error_readsmode - it's incompatible withcorrupt_bio_byte, but that's only enabled ifcorrupt_bio_byteis nonzero.Cc Benjamin Marzinski <[email protected]>Cc Mikulas Patocka <[email protected]>Cc Mike Snitzer <[email protected]>Signed-off-by Kent Overstreet <[email protected]>
Also, I see that you guys still aren't testing your changes properly.
Quoted 34 lines
--- drivers/md/dm-flakey.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)drivers/md/dm-flakey.c +6
-3@@ -215,16 +215,19 @@ static int parse_features(struct dm_arg_set *as, struct flakey_c *fc, }if (test_bit (DROP_WRITES , &fc->flags) && - (fc->corrupt_bio_rw ==WRITE || fc->random_write_corrupt)) { + ((fc->corrupt_bio_byte && fc->corrupt_bio_rw ==WRITE ) || + fc->random_write_corrupt)) { ti->error ="drop_writes is incompatible with random_write_corrupt or corrupt_bio_byte with the WRITE flag set" ;return -EINVAL ; }else if (test_bit (ERROR_WRITES , &fc->flags) && - (fc->corrupt_bio_rw ==WRITE || fc->random_write_corrupt)) { + ((fc->corrupt_bio_byte && fc->corrupt_bio_rw ==WRITE ) || + fc->random_write_corrupt)) { ti->error ="error_writes is incompatible with random_write_corrupt or corrupt_bio_byte with the WRITE flag set" ;return -EINVAL ; }else if (test_bit (ERROR_READS , &fc->flags) && - (fc->corrupt_bio_rw ==READ || fc->random_read_corrupt)) { + ((fc->corrupt_bio_byte && fc->corrupt_bio_rw ==READ ) || + fc->random_read_corrupt)) { ti->error ="error_reads is incompatible with random_read_corrupt or corrupt_bio_byte with the READ flag set" ;return -EINVAL ; }Signature · 1 line
2.49.0
Quoted 8 lines · Kent Overstreet
Fix the
error_readsmode - it's incompatible withcorrupt_bio_byte, but that's only enabled ifcorrupt_bio_byteis nonzero.Cc Benjamin Marzinski <[email protected]>Cc Mikulas Patocka <[email protected]>Cc Mike Snitzer <[email protected]>Signed-off-by Kent Overstreet <[email protected]>
Benjamin Marzinski
maintainerQuoted 8 lines · Kent Overstreet
Fix the
error_readsmode - it's incompatible withcorrupt_bio_byte, but that's only enabled ifcorrupt_bio_byteis nonzero.Cc Benjamin Marzinski <[email protected]>Cc Mikulas Patocka <[email protected]>Cc Mike Snitzer <[email protected]>Signed-off-by Kent Overstreet <[email protected]>
This commit header should include:
So that it gets picked up by the stable kernel.
-Ben
Quoted 33 lines
--- drivers/md/dm-flakey.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)drivers/md/dm-flakey.c +6
-3@@ -215,16 +215,19 @@ static int parse_features(struct dm_arg_set *as, struct flakey_c *fc, }if (test_bit (DROP_WRITES , &fc->flags) && - (fc->corrupt_bio_rw ==WRITE || fc->random_write_corrupt)) { + ((fc->corrupt_bio_byte && fc->corrupt_bio_rw ==WRITE ) || + fc->random_write_corrupt)) { ti->error ="drop_writes is incompatible with random_write_corrupt or corrupt_bio_byte with the WRITE flag set" ;return -EINVAL ; }else if (test_bit (ERROR_WRITES , &fc->flags) && - (fc->corrupt_bio_rw ==WRITE || fc->random_write_corrupt)) { + ((fc->corrupt_bio_byte && fc->corrupt_bio_rw ==WRITE ) || + fc->random_write_corrupt)) { ti->error ="error_writes is incompatible with random_write_corrupt or corrupt_bio_byte with the WRITE flag set" ;return -EINVAL ; }else if (test_bit (ERROR_READS , &fc->flags) && - (fc->corrupt_bio_rw ==READ || fc->random_read_corrupt)) { + ((fc->corrupt_bio_byte && fc->corrupt_bio_rw ==READ ) || + fc->random_read_corrupt)) { ti->error ="error_reads is incompatible with random_read_corrupt or corrupt_bio_byte with the READ flag set" ;return -EINVAL ; }Signature · 1 line
2.49.0
Quoted 10 lines · Benjamin Marzinski
Quoted 8 lines · Kent Overstreet
Fix the
error_readsmode - it's incompatible withcorrupt_bio_byte, but that's only enabled ifcorrupt_bio_byteis nonzero.Cc Benjamin Marzinski <[email protected]>Cc Mikulas Patocka <[email protected]>Cc Mike Snitzer <[email protected]>Signed-off-by Kent Overstreet <[email protected]>
Quoted 7 lines
This commit header should include:
Fixes 19da6b2c9e8e ("dm-flakey: Clean up parsing messages")So that it gets picked up by the stable kernel.
-Ben
I've applied the patch, thanks.
Mikulas