diff options
| author | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-07-03 15:05:42 -0400 |
|---|---|---|
| committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-07-03 15:05:42 -0400 |
| commit | 27c1ffb3a10db66fd997e98b09e83bce7c92e742 (patch) | |
| tree | b54d04cc37dac55905de5827e838486732f516b8 /block | |
| parent | 714becf1cac35a4be7f0402553db35ecc4286a9d (diff) | |
| parent | 1bd30958ec55d80ca72d2ca4e7e5c3d9fbf3173e (diff) | |
Merge tag 'v4.4.73' into v4.4-rt
This is the 4.4.73 stable release
Diffstat (limited to 'block')
| -rw-r--r-- | block/partitions/msdos.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/block/partitions/msdos.c b/block/partitions/msdos.c index 93e7c1b32edd..5610cd537da7 100644 --- a/block/partitions/msdos.c +++ b/block/partitions/msdos.c @@ -300,6 +300,8 @@ static void parse_bsd(struct parsed_partitions *state, continue; bsd_start = le32_to_cpu(p->p_offset); bsd_size = le32_to_cpu(p->p_size); + if (memcmp(flavour, "bsd\0", 4) == 0) + bsd_start += offset; if (offset == bsd_start && size == bsd_size) /* full parent partition, we have it already */ continue; |