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

Commit c165f69c authored by Jörn Engel's avatar Jörn Engel Committed by Nicholas Bellinger
Browse files

target: Move core_scsi3_check_cdb_abort_and_preempt 



And make it static afterwards.

Signed-off-by: default avatarJoern Engel <joern@logfs.org>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent 90c161b6

drivers/target/target_core_pr.c

+0 −15
Original line number Diff line number Diff line
@@ -2981,21 +2981,6 @@ static void core_scsi3_release_preempt_and_abort( 
	}

}



int core_scsi3_check_cdb_abort_and_preempt(

	struct list_head *preempt_and_abort_list,

	struct se_cmd *cmd)

{

	struct t10_pr_registration *pr_reg, *pr_reg_tmp;



	list_for_each_entry_safe(pr_reg, pr_reg_tmp, preempt_and_abort_list,

				pr_reg_abort_list) {

		if (pr_reg->pr_res_key == cmd->pr_res_key)

			return 0;

	}



	return 1;

}



static int core_scsi3_pro_preempt(

	struct se_cmd *cmd,

	int type,

drivers/target/target_core_pr.h

+0 −2
Original line number Diff line number Diff line
@@ -60,8 +60,6 @@ extern void core_scsi3_free_pr_reg_from_nacl(struct se_device *, 
					     struct se_node_acl *);

extern void core_scsi3_free_all_registrations(struct se_device *);

extern unsigned char *core_scsi3_pr_dump_type(int);

extern int core_scsi3_check_cdb_abort_and_preempt(struct list_head *,

						  struct se_cmd *);



extern int target_scsi3_emulate_pr_in(struct se_task *task);

extern int target_scsi3_emulate_pr_out(struct se_task *task);

drivers/target/target_core_tmr.c

+15 −0
Original line number Diff line number Diff line
@@ -100,6 +100,21 @@ static void core_tmr_handle_tas_abort( 
	transport_cmd_finish_abort(cmd, 0);

}



static int core_scsi3_check_cdb_abort_and_preempt(

	struct list_head *preempt_and_abort_list,

	struct se_cmd *cmd)

{

	struct t10_pr_registration *pr_reg, *pr_reg_tmp;



	list_for_each_entry_safe(pr_reg, pr_reg_tmp, preempt_and_abort_list,

				pr_reg_abort_list) {

		if (pr_reg->pr_res_key == cmd->pr_res_key)

			return 0;

	}



	return 1;

}



static void core_tmr_drain_tmr_list(

	struct se_device *dev,

	struct se_tmr_req *tmr,