Re: [PATCH 05/10] ide-atapi: accomodate transfer length to ide-cd

Bartlomiej Zolnierkiewicz
2008-09-15T18:32:54Z

On Sunday 14 September 2008 13:35:53 Borislav Petkov wrote:
> There should be no functional change resulting from this patch.
>
> Signed-off-by: Borislav Petkov <petkovbb@gmail.com>
> ---
> drivers/ide/ide-atapi.c | 4 +++-
> drivers/ide/ide-floppy.c | 2 +-
> drivers/ide/ide-tape.c | 2 +-
> drivers/scsi/ide-scsi.c | 3 ++-
> include/linux/ide.h | 2 +-
> 5 files changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c
> index df17401..7045d34 100644
> --- a/drivers/ide/ide-atapi.c
> +++ b/drivers/ide/ide-atapi.c
> @@ -546,7 +546,7 @@ static ide_startstop_t ide_transfer_pc(ide_drive_t *drive)
> }
>
> ide_startstop_t ide_issue_pc(ide_drive_t *drive, unsigned int timeout,
> - ide_expiry_t *expiry)
> + ide_expiry_t *expiry, int xferlen)
> {
> struct ide_atapi_pc *pc = drive->pc;
> ide_hwif_t *hwif = drive->hwif;
> @@ -561,6 +561,8 @@ ide_startstop_t ide_issue_pc(ide_drive_t *drive, unsigned int timeout,
> /* Request to transfer the entire buffer at once */
> if (drive->media == ide_tape && scsi == 0)
> bcount = pc->req_xfer;
> + else if (drive->media == ide_cdrom || drive->media == ide_optical)
> + bcount = xferlen;
> else
> bcount = min(pc->req_xfer, 63 * 1024);

If you move info->last_block to ide_drive_t it is possible to factor out
xferlen setup from ide_cd_do_request() to a separate handler and move
it here. Then xferlen argument to ide_issue_pc() won't be necessary.

How's about it?