| Message ID | 20210416074736.17409-1-mhartmay@linux.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | pc-bios/s390-ccw: don't try to read the next block if end of chunk is reached | expand |
On 16/04/2021 09.47, Marc Hartmayer wrote: > Don't read the block if a null block number is reached, because this means that > the end of chunk is reached. > > Reviewed-by: Collin Walling <walling@linux.ibm.com> > Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com> > --- > pc-bios/s390-ccw/bootmap.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/pc-bios/s390-ccw/bootmap.c b/pc-bios/s390-ccw/bootmap.c > index 44df7d16afca..b46997c0b7c1 100644 > --- a/pc-bios/s390-ccw/bootmap.c > +++ b/pc-bios/s390-ccw/bootmap.c > @@ -213,7 +213,7 @@ static int eckd_get_boot_menu_index(block_number_t s1b_block_nr) > next_block_nr = eckd_block_num(&s1b->seek[i + 1].chs); > } > > - if (next_block_nr) { > + if (next_block_nr && !is_null_block_number(next_block_nr)) { > read_block(next_block_nr, s2_next_blk, > "Cannot read stage2 boot loader"); > } Commit 468184ec9024f4f7b5 was already a similar fix ... I wonder whether we have any more of those? Anyway, Acked-by: Thomas Huth <thuth@redhat.com> and I'll queue it for my next pull request.
diff --git a/pc-bios/s390-ccw/bootmap.c b/pc-bios/s390-ccw/bootmap.c index 44df7d16afca..b46997c0b7c1 100644 --- a/pc-bios/s390-ccw/bootmap.c +++ b/pc-bios/s390-ccw/bootmap.c @@ -213,7 +213,7 @@ static int eckd_get_boot_menu_index(block_number_t s1b_block_nr) next_block_nr = eckd_block_num(&s1b->seek[i + 1].chs); } - if (next_block_nr) { + if (next_block_nr && !is_null_block_number(next_block_nr)) { read_block(next_block_nr, s2_next_blk, "Cannot read stage2 boot loader"); }