Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[linux-2.6-block.git] / include / scsi / libiscsi.h

diff --git a/include/scsi/libiscsi.h b/include/scsi/libiscsi.h
index a72edd4eceece2438469bd902e1c81e5fb2e4baa..7394e3bc8f4ba84ed723ac7b257b97ec08e65e3a 100644 (file)
--- a/include/scsi/libiscsi.h
+++ b/include/scsi/libiscsi.h
@@ -267,6 +267,7 @@ struct iscsi_session {
        /* configuration */
        int                     abort_timeout;
        int                     lu_reset_timeout;
+       int                     tgt_reset_timeout;
        int                     initial_r2t_en;
        unsigned                max_r2t;
        int                     imm_data_en;
@@ -333,7 +334,8 @@ struct iscsi_host {
 /*
  * scsi host template
  */
-extern int iscsi_change_queue_depth(struct scsi_device *sdev, int depth);
+extern int iscsi_change_queue_depth(struct scsi_device *sdev, int depth,
+                                   int reason);
 extern int iscsi_eh_abort(struct scsi_cmnd *sc);
 extern int iscsi_eh_target_reset(struct scsi_cmnd *sc);
 extern int iscsi_eh_device_reset(struct scsi_cmnd *sc);