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

Commit ee920469 authored by Nicholas Bellinger's avatar Nicholas Bellinger
Browse files

target/file: Add checks for backend DIF emulation 



Make sure that FILEIO only attempts to use backend DIF emulation
when it's actually enabled at device level.

Cc: Martin Petersen <martin.petersen@oracle.com>
Cc: Sagi Grimberg <sagig@mellanox.com>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent 72c03850

drivers/target/target_core_file.c

+4 −4
Original line number Diff line number Diff line
@@ -584,7 +584,7 @@ fd_execute_rw(struct se_cmd *cmd, struct scatterlist *sgl, u32 sgl_nents, 
	if (data_direction == DMA_FROM_DEVICE) {

		memset(&fd_prot, 0, sizeof(struct fd_prot));



		if (cmd->prot_type) {

		if (cmd->prot_type && dev->dev_attrib.pi_prot_type) {

			ret = fd_do_prot_rw(cmd, &fd_prot, false);

			if (ret < 0)

				return TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE;
@@ -592,7 +592,7 @@ fd_execute_rw(struct se_cmd *cmd, struct scatterlist *sgl, u32 sgl_nents, 


		ret = fd_do_rw(cmd, sgl, sgl_nents, 0);



		if (ret > 0 && cmd->prot_type) {

		if (ret > 0 && cmd->prot_type && dev->dev_attrib.pi_prot_type) {

			u32 sectors = cmd->data_length / dev->dev_attrib.block_size;



			rc = sbc_dif_verify_read(cmd, cmd->t_task_lba, sectors,
@@ -608,7 +608,7 @@ fd_execute_rw(struct se_cmd *cmd, struct scatterlist *sgl, u32 sgl_nents, 
	} else {

		memset(&fd_prot, 0, sizeof(struct fd_prot));



		if (cmd->prot_type) {

		if (cmd->prot_type && dev->dev_attrib.pi_prot_type) {

			u32 sectors = cmd->data_length / dev->dev_attrib.block_size;



			ret = fd_do_prot_rw(cmd, &fd_prot, false);
@@ -646,7 +646,7 @@ fd_execute_rw(struct se_cmd *cmd, struct scatterlist *sgl, u32 sgl_nents, 
			vfs_fsync_range(fd_dev->fd_file, start, end, 1);

		}



		if (ret > 0 && cmd->prot_type) {

		if (ret > 0 && cmd->prot_type && dev->dev_attrib.pi_prot_type) {

			ret = fd_do_prot_rw(cmd, &fd_prot, true);

			if (ret < 0)

				return TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE;