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

Commit 3e451a49 authored by Jeff Garzik's avatar Jeff Garzik Committed by Jeff Garzik
Browse files

[libata] scsi: Remove unlikely() from FUA check 



Some other unlikely() should probably be removed as well.  A fresh look
reveals an over-enthusiasm for unlikely() in libata-scsi.c.

Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 91895b78

drivers/ata/libata-scsi.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1655,7 +1655,7 @@ static unsigned int ata_scsi_rw_xlat(struct ata_queued_cmd *qc) 
		if (unlikely(scmd->cmd_len < 10))

		if (unlikely(scmd->cmd_len < 10))

			goto invalid_fld;

			goto invalid_fld;

		scsi_10_lba_len(cdb, &block, &n_block);

		scsi_10_lba_len(cdb, &block, &n_block);

		if (unlikely(cdb[1] & (1 << 3)))

		if (cdb[1] & (1 << 3))

			tf_flags |= ATA_TFLAG_FUA;

			tf_flags |= ATA_TFLAG_FUA;

		break;

		break;

	case READ_6:

	case READ_6:
@@ -1675,7 +1675,7 @@ static unsigned int ata_scsi_rw_xlat(struct ata_queued_cmd *qc) 
		if (unlikely(scmd->cmd_len < 16))

		if (unlikely(scmd->cmd_len < 16))

			goto invalid_fld;

			goto invalid_fld;

		scsi_16_lba_len(cdb, &block, &n_block);

		scsi_16_lba_len(cdb, &block, &n_block);

		if (unlikely(cdb[1] & (1 << 3)))

		if (cdb[1] & (1 << 3))

			tf_flags |= ATA_TFLAG_FUA;

			tf_flags |= ATA_TFLAG_FUA;

		break;

		break;

	default:

	default: