Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 626542ca authored by Borislav Petkov's avatar Borislav Petkov Committed by Bartlomiej Zolnierkiewicz
Browse files

ide-tape: change IDE_AFLAG_IGNORE_DSC non-atomically 



There are two sites where the flag is being changed: ide_retry_pc
and idetape_do_request. Both codepaths are protected by hwif->busy
(ide_lock_port) and therefore we shouldn't need the atomic accesses.

Spotted-by: default avatarJiri Slaby <jirislaby@gmail.com>
Signed-off-by: default avatarBorislav Petkov <petkovbb@gmail.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent ffddf171

drivers/ide/ide-atapi.c

+1 −1
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ void ide_retry_pc(ide_drive_t *drive) 
	pc->req_xfer = sense_rq->data_len;



	if (drive->media == ide_tape)

		set_bit(IDE_AFLAG_IGNORE_DSC, &drive->atapi_flags);

		drive->atapi_flags |= IDE_AFLAG_IGNORE_DSC;



	if (ide_queue_sense_rq(drive, pc))

		ide_complete_rq(drive, -EIO, blk_rq_bytes(drive->hwif->rq));

drivers/ide/ide-tape.c

+7 −5
Original line number Diff line number Diff line
@@ -656,15 +656,15 @@ static ide_startstop_t idetape_do_request(ide_drive_t *drive, 


	if ((drive->dev_flags & IDE_DFLAG_DSC_OVERLAP) == 0 &&

	    (rq->cmd[13] & REQ_IDETAPE_PC2) == 0)

		set_bit(IDE_AFLAG_IGNORE_DSC, &drive->atapi_flags);

		drive->atapi_flags |= IDE_AFLAG_IGNORE_DSC;



	if (drive->dev_flags & IDE_DFLAG_POST_RESET) {

		set_bit(IDE_AFLAG_IGNORE_DSC, &drive->atapi_flags);

		drive->atapi_flags |= IDE_AFLAG_IGNORE_DSC;

		drive->dev_flags &= ~IDE_DFLAG_POST_RESET;

	}



	if (!test_and_clear_bit(IDE_AFLAG_IGNORE_DSC, &drive->atapi_flags) &&

	    (stat & ATA_DSC) == 0) {

	if (!(drive->atapi_flags & IDE_AFLAG_IGNORE_DSC) &&

	    !(stat & ATA_DSC)) {

		if (postponed_rq == NULL) {

			tape->dsc_polling_start = jiffies;

			tape->dsc_poll_freq = tape->best_dsc_rw_freq;
@@ -684,7 +684,9 @@ static ide_startstop_t idetape_do_request(ide_drive_t *drive, 
			tape->dsc_poll_freq = IDETAPE_DSC_MA_SLOW;

		idetape_postpone_request(drive);

		return ide_stopped;

	}

	} else

		drive->atapi_flags &= ~IDE_AFLAG_IGNORE_DSC;



	if (rq->cmd[13] & REQ_IDETAPE_READ) {

		pc = &tape->queued_pc;

		ide_tape_create_rw_cmd(tape, pc, rq, READ_6);