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

Commit b0b93b48 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: move REQ_TYPE_SENSE to the ide driver 



Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent b42171ef

drivers/ide/ide-atapi.c

+3 −3
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ void ide_prep_sense(ide_drive_t *drive, struct request *rq) 


	BUG_ON(sense_len > sizeof(*sense));



	if (rq->cmd_type == REQ_TYPE_SENSE || drive->sense_rq_armed)

	if (rq->cmd_type == REQ_TYPE_ATA_SENSE || drive->sense_rq_armed)

		return;



	memset(sense, 0, sizeof(*sense));
@@ -210,7 +210,7 @@ void ide_prep_sense(ide_drive_t *drive, struct request *rq) 
	sense_rq->rq_disk = rq->rq_disk;

	sense_rq->cmd[0] = GPCMD_REQUEST_SENSE;

	sense_rq->cmd[4] = cmd_len;

	sense_rq->cmd_type = REQ_TYPE_SENSE;

	sense_rq->cmd_type = REQ_TYPE_ATA_SENSE;

	sense_rq->cmd_flags |= REQ_PREEMPT;



	if (drive->media == ide_tape)
@@ -310,7 +310,7 @@ int ide_cd_get_xferlen(struct request *rq) 
	switch (rq->cmd_type) {

	case REQ_TYPE_FS:

		return 32768;

	case REQ_TYPE_SENSE:

	case REQ_TYPE_ATA_SENSE:

	case REQ_TYPE_BLOCK_PC:

	case REQ_TYPE_ATA_PC:

		return blk_rq_bytes(rq);

drivers/ide/ide-cd.c

+4 −4
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ static void cdrom_analyze_sense_data(ide_drive_t *drive, 
static void ide_cd_complete_failed_rq(ide_drive_t *drive, struct request *rq)

{

	/*

	 * For REQ_TYPE_SENSE, "rq->special" points to the original

	 * For REQ_TYPE_ATA_SENSE, "rq->special" points to the original

	 * failed request.  Also, the sense data should be read

	 * directly from rq which might be different from the original

	 * sense buffer if it got copied during mapping.
@@ -285,7 +285,7 @@ static int cdrom_decode_status(ide_drive_t *drive, u8 stat) 
				  "stat 0x%x",

				  rq->cmd[0], rq->cmd_type, err, stat);



	if (rq->cmd_type == REQ_TYPE_SENSE) {

	if (rq->cmd_type == REQ_TYPE_ATA_SENSE) {

		/*

		 * We got an error trying to get sense info from the drive

		 * (probably while trying to recover from a former error).
@@ -526,7 +526,7 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive) 
	ide_expiry_t *expiry = NULL;

	int dma_error = 0, dma, thislen, uptodate = 0;

	int write = (rq_data_dir(rq) == WRITE) ? 1 : 0, rc = 0;

	int sense = (rq->cmd_type == REQ_TYPE_SENSE);

	int sense = (rq->cmd_type == REQ_TYPE_ATA_SENSE);

	unsigned int timeout;

	u16 len;

	u8 ireason, stat;
@@ -791,7 +791,7 @@ static ide_startstop_t ide_cd_do_request(ide_drive_t *drive, struct request *rq, 
		if (cdrom_start_rw(drive, rq) == ide_stopped)

			goto out_end;

		break;

	case REQ_TYPE_SENSE:

	case REQ_TYPE_ATA_SENSE:

	case REQ_TYPE_BLOCK_PC:

	case REQ_TYPE_ATA_PC:

		if (!rq->timeout)

drivers/ide/ide-floppy.c

+1 −1
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ static ide_startstop_t ide_floppy_do_request(ide_drive_t *drive, 
		idefloppy_create_rw_cmd(drive, pc, rq, (unsigned long)block);

		break;

	case REQ_TYPE_DRV_PRIV:

	case REQ_TYPE_SENSE:

	case REQ_TYPE_ATA_SENSE:

		pc = (struct ide_atapi_pc *)rq->special;

		break;

	case REQ_TYPE_BLOCK_PC:

drivers/ide/ide-tape.c

+1 −1
Original line number Diff line number Diff line
@@ -577,7 +577,7 @@ static ide_startstop_t idetape_do_request(ide_drive_t *drive, 
		      blk_rq_sectors(rq));



	BUG_ON(!(rq->cmd_type == REQ_TYPE_DRV_PRIV ||

		 rq->cmd_type == REQ_TYPE_SENSE));

		 rq->cmd_type == REQ_TYPE_ATA_SENSE));



	/* Retry a failed packet command */

	if (drive->failed_pc && drive->pc->c[0] == REQUEST_SENSE) {

include/linux/blkdev.h

+0 −1
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ struct request_list { 
enum rq_cmd_type_bits {

	REQ_TYPE_FS		= 1,	/* fs request */

	REQ_TYPE_BLOCK_PC,		/* scsi command */

	REQ_TYPE_SENSE,			/* sense request */

	REQ_TYPE_PM_SUSPEND,		/* suspend request */

	REQ_TYPE_PM_RESUME,		/* resume request */

	REQ_TYPE_PM_SHUTDOWN,		/* shutdown request */