From: Thomas Richter <thor@math.TU-Berlin.DE>
To: linux-kernel@vger.kernel.org
Subject: [PATCH] Amiga partition fix
Date: Tue, 7 Sep 2004 17:47:53 +0200 (CEST) [thread overview]
Message-ID: <200409071547.RAA03166@cleopatra.math.tu-berlin.de> (raw)
Hi,
what happened to Joanne Dow's patch to fix the recognition of
Amiga RDSK blocks? In case that got lost, here's the patch again:
/* snip */
--- amiga.c 2004-08-09 08:52:07.268123677 -0700
+++ amiga.c.orig 2004-08-09 08:51:31.527104456 -0700
@@ -31,7 +31,6 @@ amiga_partition(struct parsed_partitions
struct RigidDiskBlock *rdb;
struct PartitionBlock *pb;
int start_sect, nr_sects, blk, part, res = 0;
- int blksize = 1; /* Multiplier for disk block size */
int slot = 1;
char b[BDEVNAME_SIZE];
@@ -66,14 +65,10 @@ amiga_partition(struct parsed_partitions
bdevname(bdev, b), blk);
}
- /* blksize is blocks per 512 byte standard block */
- blksize = be32_to_cpu( rdb->rdb_BlockBytes ) / 512;
-
- printk(" RDSK (%d)", blksize * 512); /* Be more informative */
+ printk(" RDSK");
blk = be32_to_cpu(rdb->rdb_PartitionList);
put_dev_sector(sect);
for (part = 1; blk>0 && part<=16; part++, put_dev_sector(sect)) {
- blk *= blksize; /* Read in terms partition table understands */
data = read_dev_sector(bdev, blk, §);
if (!data) {
if (warn_no_part)
@@ -93,32 +88,13 @@ amiga_partition(struct parsed_partitions
nr_sects = (be32_to_cpu(pb->pb_Environment[10]) + 1 -
be32_to_cpu(pb->pb_Environment[9])) *
be32_to_cpu(pb->pb_Environment[3]) *
- be32_to_cpu(pb->pb_Environment[5]) *
- blksize;
+ be32_to_cpu(pb->pb_Environment[5]);
if (!nr_sects)
continue;
start_sect = be32_to_cpu(pb->pb_Environment[9]) *
be32_to_cpu(pb->pb_Environment[3]) *
- be32_to_cpu(pb->pb_Environment[5]) *
- blksize;
+ be32_to_cpu(pb->pb_Environment[5]);
put_partition(state,slot++,start_sect,nr_sects);
- {
- /* Be even more informative to aid mounting */
- char dostype[ 4 ];
- u32 *dt = (u32*) dostype;
- *dt = pb->pb_Environment[ 16 ];
- if ( dostype[ 3 ] < ' ')
- printk( " (%c%c%c^%c)",
- dostype[ 0 ], dostype[ 1 ],
- dostype[ 2 ], dostype[ 3 ] + '@' );
- else
- printk( " (%c%c%c%c)",
- dostype[ 0 ], dostype[ 1 ],
- dostype[ 2 ], dostype[ 3 ]);
- printk( "(res %d spb %d)",
- be32_to_cpu( pb->pb_Environment[ 6 ]),
- be32_to_cpu( pb->pb_Environment[ 4 ]));
- }
res = 1;
}
printk("\n");
/* snip */
So long,
Thomas
next reply other threads:[~2004-09-07 15:53 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-09-07 15:47 Thomas Richter [this message]
2004-09-07 22:50 ` [PATCH] Amiga partition fix jdow
2004-09-08 8:56 ` Geert Uytterhoeven
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200409071547.RAA03166@cleopatra.math.tu-berlin.de \
--to=thor@math.tu-berlin.de \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox