Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 220b67a16fde7187fae7efcc6809d658e4c49525

Authored by Richard
Committed by Greg Kroah-Hartman
1 parent 7a7b2d5f65

partitions/msdos: FreeBSD UFS2 file systems are not recognized 

commit 223220356d5ebc05ead9a8d697abb0c0a906fc81 upstream.

The code in block/partitions/msdos.c recognizes FreeBSD, OpenBSD
and NetBSD partitions and does a reasonable job picking out OpenBSD
and NetBSD UFS subpartitions.

But for FreeBSD the subpartitions are always "bad".

    Kernel: <bsd:bad subpartition - ignored

Though all 3 of these BSD systems use UFS as a file system, only
FreeBSD uses relative start addresses in the subpartition
declarations.

The following patch fixes this for FreeBSD partitions and leaves
the code for OpenBSD and NetBSD intact:

Signed-off-by: Richard Narron <comet.berkeley@gmail.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 1 changed file with 2 additions and 0 deletions Side-by-side Diff

block/partitions/msdos.c
Diff comments   View file @ 220b67a
... ... @@ -300,6 +300,8 @@
300 300 continue;
301 301 bsd_start = le32_to_cpu(p->p_offset);
302 302 bsd_size = le32_to_cpu(p->p_size);
  303 + if (memcmp(flavour, "bsd\0", 4) == 0)
  304 + bsd_start += offset;
303 305 if (offset == bsd_start && size == bsd_size)
304 306 /* full parent partition, we have it already */
305 307 continue;