aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/libiscsi.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/libiscsi.c')
-rw-r--r--drivers/scsi/libiscsi.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c
index 3d1bc67bac9d..f2db82beb646 100644
--- a/drivers/scsi/libiscsi.c
+++ b/drivers/scsi/libiscsi.c
@@ -260,7 +260,7 @@ static int iscsi_check_tmf_restrictions(struct iscsi_task *task, int opcode)
260{ 260{
261 struct iscsi_conn *conn = task->conn; 261 struct iscsi_conn *conn = task->conn;
262 struct iscsi_tm *tmf = &conn->tmhdr; 262 struct iscsi_tm *tmf = &conn->tmhdr;
263 unsigned int hdr_lun; 263 u64 hdr_lun;
264 264
265 if (conn->tmf_state == TMF_INITIAL) 265 if (conn->tmf_state == TMF_INITIAL)
266 return 0; 266 return 0;
@@ -1859,8 +1859,7 @@ static int iscsi_exec_task_mgmt_fn(struct iscsi_conn *conn,
1859 * Fail commands. session lock held and recv side suspended and xmit 1859 * Fail commands. session lock held and recv side suspended and xmit
1860 * thread flushed 1860 * thread flushed
1861 */ 1861 */
1862static void fail_scsi_tasks(struct iscsi_conn *conn, unsigned lun, 1862static void fail_scsi_tasks(struct iscsi_conn *conn, u64 lun, int error)
1863 int error)
1864{ 1863{
1865 struct iscsi_task *task; 1864 struct iscsi_task *task;
1866 int i; 1865 int i;
@@ -2279,7 +2278,8 @@ int iscsi_eh_device_reset(struct scsi_cmnd *sc)
2279 cls_session = starget_to_session(scsi_target(sc->device)); 2278 cls_session = starget_to_session(scsi_target(sc->device));
2280 session = cls_session->dd_data; 2279 session = cls_session->dd_data;
2281 2280
2282 ISCSI_DBG_EH(session, "LU Reset [sc %p lun %u]\n", sc, sc->device->lun); 2281 ISCSI_DBG_EH(session, "LU Reset [sc %p lun %llu]\n", sc,
2282 sc->device->lun);
2283 2283
2284 mutex_lock(&session->eh_mutex); 2284 mutex_lock(&session->eh_mutex);
2285 spin_lock_bh(&session->frwd_lock); 2285 spin_lock_bh(&session->frwd_lock);