Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci

[~andy/linux] / drivers / target / target_core_internal.h

diff --git a/drivers/target/target_core_internal.h b/drivers/target/target_core_internal.h
index 45001364788aeebfa3368c8068767e623e4c4488..21c05638f1587dc5328ccca291bf94553ebc1ec8 100644 (file)
--- a/drivers/target/target_core_internal.h
+++ b/drivers/target/target_core_internal.h
@@ -53,6 +53,7 @@ int   se_dev_set_is_nonrot(struct se_device *, int);
 int    se_dev_set_emulate_rest_reord(struct se_device *dev, int);
 int    se_dev_set_queue_depth(struct se_device *, u32);
 int    se_dev_set_max_sectors(struct se_device *, u32);
+int    se_dev_set_fabric_max_sectors(struct se_device *, u32);
 int    se_dev_set_optimal_sectors(struct se_device *, u32);
 int    se_dev_set_block_size(struct se_device *, u32);
 struct se_lun *core_dev_add_lun(struct se_portal_group *, struct se_hba *,
@@ -75,6 +76,8 @@ struct se_hba *core_alloc_hba(const char *, u32, u32);
 int    core_delete_hba(struct se_hba *);
 
 /* target_core_tmr.c */
+void   core_tmr_abort_task(struct se_device *, struct se_tmr_req *,
+                       struct se_session *);
 int    core_tmr_lun_reset(struct se_device *, struct se_tmr_req *,
                struct list_head *, struct se_cmd *);