Bartlomiej Zolnierkiewicz wrote:
> Hi,
>
> On Wednesday 16 April 2008, Roel Kluin wrote:
>> Is this the right fix in this case?
>
> Yes, but it seems that 'valid' is only written to
> so it may be as well removed completely.
>
> Care to update the patch?
>
> Thanks,
> Bart
how about this?
Roel
---
Clean up cdrom_analyze_sense_data()
Signed-off-by: Roel Kluin <12o3l@xxxxxxxxxx>
---
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index a60f5df..a5f3beb 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -143,8 +143,6 @@ void cdrom_analyze_sense_data(ide_drive_t *drive,
struct request_sense *sense)
{
unsigned long sector;
- unsigned long bio_sectors;
- unsigned long valid;
struct cdrom_info *info = drive->driver_data;
if (!cdrom_log_sense(drive, failed_command, sense))
@@ -174,13 +172,9 @@ void cdrom_analyze_sense_data(ide_drive_t *drive,
(sense->information[2] << 8) |
(sense->information[3]);
- bio_sectors = bio_sectors(failed_command->bio);
- if (bio_sectors < 4)
- bio_sectors = 4;
if (drive->queue->hardsect_size == 2048)
sector <<= 2; /* Device sector size is 2K */
- sector &= ~(bio_sectors -1);
- valid = (sector - failed_command->sector) << 9;
+ sector &= ~(max(bio_sectors(failed_command->bio) - 1, 3));
if (sector < get_capacity(info->disk) &&
drive->probed_capacity - sector < 4 * 75) {
--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
