mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-06-09 23:22:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix kernel 3.17 checkpatch warnings about 'long long unsigned'

Browse Source 
Avoid that checkpatch reports the following warning:

WARNING: type 'long long unsigned' should be specified in 'unsigned long long' order.


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@5885 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2014-11-26 08:16:44 +00:00
parent d8c750993d
commit 9707f85c0b
11 changed files with 95 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
iscsi-scst/kernel/config.c
+2 -2
View File
@@ -339,7 +339,7 @@ static int add_conn(void __user *ptr)
session = session_lookup(target, info.sid);
if (!session) {
PRINT_ERROR("Session %lld not found",
(long long unsigned int)info.tid);
(unsigned long long int)info.tid);
err = -ENOENT;
goto out_unlock;
}
@@ -383,7 +383,7 @@ static int del_conn(void __user *ptr)
session = session_lookup(target, info.sid);
if (!session) {
PRINT_ERROR("Session %llx not found",
(long long unsigned int)info.sid);
(unsigned long long int)info.sid);
err = -ENOENT;
goto out_unlock;
}
iscsi-scst/kernel/conn.c
+5 -5
View File
@@ -563,7 +563,7 @@ static void conn_rsp_timer_fn(unsigned long arg)
"%s (SID %llx), closing connection",
iscsi_get_timeout(cmnd)/HZ,
conn->session->initiator_name,
(long long unsigned int)
(unsigned long long int)
conn->session->sid);
/*
* We must call mark_conn_closed() outside of
@@ -794,13 +794,13 @@ static int conn_setup_sock(struct iscsi_conn *conn)
mm_segment_t oldfs;
struct iscsi_session *session = conn->session;
TRACE_DBG("%llx", (long long unsigned int)session->sid);
TRACE_DBG("%llx", (unsigned long long int)session->sid);
conn->sock = SOCKET_I(conn->file->f_dentry->d_inode);
if (conn->sock->ops->sendpage == NULL) {
PRINT_ERROR("Socket for sid %llx doesn't support sendpage()",
(long long unsigned int)session->sid);
(unsigned long long int)session->sid);
res = -EINVAL;
goto out;
}
@@ -828,7 +828,7 @@ int conn_free(struct iscsi_conn *conn)
TRACE_ENTRY();
TRACE_MGMT_DBG("Freeing conn %p (sess=%p, %#Lx %u)", conn,
session, (long long unsigned int)session->sid, conn->cid);
session, (unsigned long long int)session->sid, conn->cid);
lockdep_assert_held(&conn->target->target_mutex);
@@ -892,7 +892,7 @@ static int iscsi_conn_alloc(struct iscsi_session *session,
}
TRACE_MGMT_DBG("Creating connection %p for sid %#Lx, cid %u", conn,
(long long unsigned int)session->sid, info->cid);
(unsigned long long int)session->sid, info->cid);
/* Changing it, change ISCSI_CONN_IOV_MAX as well !! */
conn->read_iov = (struct iovec *)get_zeroed_page(GFP_KERNEL);
iscsi-scst/kernel/iscsi.c
+2 -2
View File
@@ -2312,8 +2312,8 @@ static int cmnd_abort_pre_checks(struct iscsi_cmnd *req, int *status)
if (req_hdr->lun != hdr->lun) {
PRINT_ERROR("ABORT TASK: LUN mismatch: req LUN "
"%llx, cmd LUN %llx, rtt %u",
(long long unsigned)be64_to_cpu(req_hdr->lun),
(long long unsigned)be64_to_cpu(hdr->lun),
(unsigned long long)be64_to_cpu(req_hdr->lun),
(unsigned long long)be64_to_cpu(hdr->lun),
req_hdr->rtt);
*status = ISCSI_RESPONSE_FUNCTION_REJECTED;
goto out_put;
iscsi-scst/kernel/nthread.c
+3 -3
View File
@@ -1332,7 +1332,7 @@ retry:
count, &off);
set_fs(oldfs);
TRACE_WRITE("sid %#Lx, cid %u, res %d, iov_len %zd",
(long long unsigned int)conn->session->sid,
(unsigned long long int)conn->session->sid,
conn->cid, res, iop->iov_len);
if (unlikely(res <= 0)) {
if (res == -EAGAIN) {
@@ -1463,7 +1463,7 @@ retry2:
"index %lu, offset %u, size %u, cmd %p, "
"page %p)", (sendpage != sock_no_sendpage) ?
"sendpage" : "sock_no_sendpage",
(long long unsigned int)conn->session->sid,
(unsigned long long int)conn->session->sid,
conn->cid, res, page->index,
offset, size, write_cmnd, page);
if (unlikely(res <= 0)) {
@@ -1549,7 +1549,7 @@ out_err:
{
#endif
PRINT_ERROR("error %d at sid:cid %#Lx:%u, cmnd %p", res,
(long long unsigned int)conn->session->sid,
(unsigned long long int)conn->session->sid,
conn->cid, conn->write_cmnd);
}
if (ref_cmd_to_parent &&
iscsi-scst/kernel/session.c
+3 -3
View File
@@ -374,7 +374,7 @@ int __del_session(struct iscsi_target *target, u64 sid)
if (!list_empty(&session->conn_list)) {
PRINT_ERROR("%llx still have connections",
(long long unsigned int)session->sid);
(unsigned long long int)session->sid);
return -EBUSY;
}
@@ -391,7 +391,7 @@ void iscsi_sess_force_close(struct iscsi_session *sess)
lockdep_assert_held(&sess->target->target_mutex);
PRINT_INFO("Deleting session %llx with initiator %s (%p)",
(long long unsigned int)sess->sid, sess->initiator_name, sess);
(unsigned long long int)sess->sid, sess->initiator_name, sess);
list_for_each_entry(conn, &sess->conn_list, conn_list_entry) {
TRACE_MGMT_DBG("Deleting connection with initiator %p", conn);
@@ -415,7 +415,7 @@ static void iscsi_session_info_show(struct seq_file *seq,
list_for_each_entry(session, &target->session_list,
session_list_entry) {
seq_printf(seq, "\tsid:%llx initiator:%s (reinstating %s)\n",
(long long unsigned int)session->sid,
(unsigned long long int)session->sid,
session->initiator_name,
session->sess_reinstating ? "yes" : "no");
conn_info_show(seq, session);
qla2x00t/qla2x00-target/qla2x00t.c
+6 -6
View File
@@ -2409,8 +2409,8 @@ static void q2t_load_cont_data_segments(struct q2t_prm *prm)
*dword_ptr++ = cpu_to_le32(sg_dma_len(prm->sg));
TRACE_SG("S/G Segment Cont. phys_addr=%llx:%llx, len=%d",
(long long unsigned int)pci_dma_hi32(dma_addr),
(long long unsigned int)pci_dma_lo32(dma_addr),
(unsigned long long int)pci_dma_hi32(dma_addr),
(unsigned long long int)pci_dma_lo32(dma_addr),
(int)sg_dma_len(prm->sg));
prm->sg = __sg_next_inline(prm->sg);
@@ -2470,8 +2470,8 @@ static void q2x_load_data_segments(struct q2t_prm *prm)
*dword_ptr++ = cpu_to_le32(sg_dma_len(prm->sg));
TRACE_SG("S/G Segment phys_addr=%llx:%llx, len=%d",
(long long unsigned int)pci_dma_hi32(dma_addr),
(long long unsigned int)pci_dma_lo32(dma_addr),
(unsigned long long int)pci_dma_hi32(dma_addr),
(unsigned long long int)pci_dma_lo32(dma_addr),
(int)sg_dma_len(prm->sg));
prm->sg = __sg_next_inline(prm->sg);
@@ -2532,8 +2532,8 @@ static void q24_load_data_segments(struct q2t_prm *prm)
*dword_ptr++ = cpu_to_le32(sg_dma_len(prm->sg));
TRACE_SG("S/G Segment phys_addr=%llx:%llx, len=%d",
(long long unsigned int)pci_dma_hi32(dma_addr),
(long long unsigned int)pci_dma_lo32(dma_addr),
(unsigned long long int)pci_dma_hi32(dma_addr),
(unsigned long long int)pci_dma_lo32(dma_addr),
(int)sg_dma_len(prm->sg));
prm->sg = __sg_next_inline(prm->sg);
scst/src/dev_handlers/scst_user.c
+3 -3
View File
@@ -1370,7 +1370,7 @@ out_process:
out_inval:
PRINT_ERROR("Invalid parse_reply parameters (LUN %lld, op %s, cmd %p)",
(long long unsigned int)cmd->lun, scst_get_opcode_name(cmd), cmd);
(unsigned long long int)cmd->lun, scst_get_opcode_name(cmd), cmd);
PRINT_BUFFER("Invalid parse_reply", reply, sizeof(*reply));
scst_set_cmd_error(cmd, SCST_LOAD_SENSE(scst_sense_hardw_error));
res = -EINVAL;
@@ -1556,7 +1556,7 @@ out:
out_inval:
PRINT_ERROR("Invalid exec_reply parameters (LUN %lld, op %s, cmd %p)",
(long long unsigned int)cmd->lun, scst_get_opcode_name(cmd), cmd);
(unsigned long long int)cmd->lun, scst_get_opcode_name(cmd), cmd);
PRINT_BUFFER("Invalid exec_reply", reply, sizeof(*reply));
out_hwerr:
@@ -1996,7 +1996,7 @@ static int dev_user_reply_get_cmd(struct file *file, void __user *arg)
goto out_up;
}
TRACE_DBG("ureply %lld (dev %s)", (long long unsigned int)ureply,
TRACE_DBG("ureply %lld (dev %s)", (unsigned long long int)ureply,
dev->name);
cmd = kmem_cache_alloc(user_get_cmd_cachep, GFP_KERNEL);
scst/src/dev_handlers/scst_vdisk.c
+19 -19
View File
@@ -1387,8 +1387,8 @@ static int vdisk_attach(struct scst_device *dev)
(dev->type == TYPE_DISK) ? "disk" : "cdrom",
virt_dev->name, vdev_get_filename(virt_dev),
virt_dev->file_size >> 20, dev->block_size,
(long long unsigned int)virt_dev->nblocks,
(long long unsigned int)virt_dev->nblocks/64/32,
(unsigned long long int)virt_dev->nblocks,
(unsigned long long int)virt_dev->nblocks/64/32,
virt_dev->nblocks < 64*32
? " !WARNING! cyln less than 1" : "");
} else {
@@ -1541,8 +1541,8 @@ static enum compl_status_e vdisk_synchronize_cache(struct vdisk_cmd_params *p)
TRACE(TRACE_ORDER, "SYNCHRONIZE_CACHE: "
"loff=%lld, data_len=%lld, immed=%d",
(long long unsigned int)loff,
(long long unsigned int)data_len, immed);
(unsigned long long int)loff,
(unsigned long long int)data_len, immed);
if (data_len == 0) {
struct scst_vdisk_dev *virt_dev = dev->dh_priv;
@@ -2326,9 +2326,9 @@ static bool vdisk_parse_offset(struct vdisk_cmd_params *p, struct scst_cmd *cmd)
loff = (loff_t)lba_start << dev->block_shift;
TRACE_DBG("cmd %p, lba_start %lld, loff %lld, data_len %lld", cmd,
(long long unsigned int)lba_start,
(long long unsigned int)loff,
(long long unsigned int)data_len);
(unsigned long long int)lba_start,
(unsigned long long int)loff,
(unsigned long long int)data_len);
EXTRACHECKS_BUG_ON((loff < 0) || unlikely(data_len < 0));
@@ -2340,9 +2340,9 @@ static bool vdisk_parse_offset(struct vdisk_cmd_params *p, struct scst_cmd *cmd)
} else {
PRINT_INFO("Access beyond the end of device %s "
"(%lld of %lld, data len %lld)", virt_dev->name,
(long long unsigned int)loff,
(long long unsigned int)virt_dev->file_size,
(long long unsigned int)data_len);
(unsigned long long int)loff,
(unsigned long long int)virt_dev->file_size,
(unsigned long long int)data_len);
scst_set_cmd_error(cmd, SCST_LOAD_SENSE(
scst_sense_block_out_range_error));
}
@@ -2358,8 +2358,8 @@ static bool vdisk_parse_offset(struct vdisk_cmd_params *p, struct scst_cmd *cmd)
fua = (cdb[1] & 0x8);
if (fua) {
TRACE(TRACE_ORDER, "FUA: loff=%lld, "
"data_len=%lld", (long long unsigned int)loff,
(long long unsigned int)data_len);
"data_len=%lld", (unsigned long long int)loff,
(unsigned long long int)data_len);
}
break;
}
@@ -4964,7 +4964,7 @@ static enum compl_status_e fileio_exec_read(struct vdisk_cmd_params *p)
if ((err < 0) || (err < full_len)) {
PRINT_ERROR("readv() returned %lld from %zd",
(long long unsigned int)err,
(unsigned long long int)err,
full_len);
if (err == -EAGAIN)
scst_set_busy(cmd);
@@ -5089,7 +5089,7 @@ restart:
if (err < 0) {
PRINT_ERROR("write() returned %lld from %zd",
(long long unsigned int)err,
(unsigned long long int)err,
full_len);
if (err == -EAGAIN)
scst_set_busy(cmd);
@@ -5837,7 +5837,7 @@ static enum compl_status_e vdev_exec_verify(struct vdisk_cmd_params *p)
err = vdev_read_sync(virt_dev, mem_verify, len_mem, &loff);
if ((err < 0) || (err < len_mem)) {
PRINT_ERROR("verify() returned %lld from %zd",
(long long unsigned int)err, len_mem);
(unsigned long long int)err, len_mem);
if (err == -EAGAIN)
scst_set_busy(cmd);
else {
@@ -6159,8 +6159,8 @@ static int vdisk_resync_size(struct scst_vdisk_dev *virt_dev)
"(fs=%lldMB, bs=%d, nblocks=%lld, cyln=%lld%s)",
virt_dev->name, virt_dev->file_size >> 20,
virt_dev->dev->block_size,
(long long unsigned int)virt_dev->nblocks,
(long long unsigned int)virt_dev->nblocks/64/32,
(unsigned long long int)virt_dev->nblocks,
(unsigned long long int)virt_dev->nblocks/64/32,
virt_dev->nblocks < 64*32 ? " !WARNING! cyln less "
"than 1" : "");
@@ -6959,8 +6959,8 @@ static int vcdrom_change(struct scst_vdisk_dev *virt_dev,
" cyln=%lld%s)", virt_dev->name,
vdev_get_filename(virt_dev),
virt_dev->file_size >> 20, virt_dev->dev->block_size,
(long long unsigned int)virt_dev->nblocks,
(long long unsigned int)virt_dev->nblocks/64/32,
(unsigned long long int)virt_dev->nblocks,
(unsigned long long int)virt_dev->nblocks/64/32,
virt_dev->nblocks < 64*32 ? " !WARNING! cyln less "
"than 1" : "");
} else {
scst/src/scst_lib.c
+11 -11
View File
@@ -3176,7 +3176,7 @@ static bool __scst_adjust_sg(struct scst_cmd *cmd, struct scatterlist *sg,
TRACE_DBG_FLAG(TRACE_SG_OP|TRACE_MEMORY|TRACE_DEBUG,
"cmd %p (tag %llu), sg %p, sg_cnt %d, "
"adjust_len %d, i %d, sg[j].length %d, left %d",
cmd, (long long unsigned int)cmd->tag,
cmd, (unsigned long long int)cmd->tag,
sg, *sg_cnt, adjust_len, i,
sgi->length, left);
@@ -4642,7 +4642,7 @@ static int scst_alloc_add_tgt_dev(struct scst_session *sess,
scst_sgv_pool_use_dma(tgt_dev);
TRACE_MGMT_DBG("Device %s on SCST lun=%lld",
dev->virt_name, (long long unsigned int)tgt_dev->lun);
dev->virt_name, (unsigned long long int)tgt_dev->lun);
spin_lock_init(&tgt_dev->tgt_dev_lock);
INIT_LIST_HEAD(&tgt_dev->UA_list);
@@ -5917,7 +5917,7 @@ void scst_free_cmd(struct scst_cmd *cmd)
TRACE_ENTRY();
TRACE_DBG("Freeing cmd %p (tag %llu)",
cmd, (long long unsigned int)cmd->tag);
cmd, (unsigned long long int)cmd->tag);
if (unlikely(test_bit(SCST_CMD_ABORTED, &cmd->cmd_flags)))
TRACE_MGMT_DBG("Freeing aborted cmd %p", cmd);
@@ -5958,7 +5958,7 @@ void scst_free_cmd(struct scst_cmd *cmd)
&cmd->cmd_flags);
TRACE_SN("Out of SN cmd %p (tag %llu, sn %d), "
"destroy=%d", cmd,
(long long unsigned int)cmd->tag,
(unsigned long long int)cmd->tag,
cmd->sn, destroy);
}
}
@@ -8600,7 +8600,7 @@ static void scst_free_all_UA(struct scst_tgt_dev *tgt_dev)
list_for_each_entry_safe(UA_entry, t,
&tgt_dev->UA_list, UA_list_entry) {
TRACE_MGMT_DBG("Clearing UA for tgt_dev LUN %lld",
(long long unsigned int)tgt_dev->lun);
(unsigned long long int)tgt_dev->lun);
list_del(&UA_entry->UA_list_entry);
mempool_free(UA_entry, scst_ua_mempool);
}
@@ -8683,7 +8683,7 @@ restart:
* !! destroyed! !!
*/
TRACE_SN("cmd %p (tag %llu) with skipped sn %d found",
cmd, (long long unsigned int)cmd->tag, cmd->sn);
cmd, (unsigned long long int)cmd->tag, cmd->sn);
order_data->def_cmd_count--;
list_del(&cmd->deferred_cmd_list_entry);
spin_unlock_irq(&order_data->sn_lock);
@@ -8783,13 +8783,13 @@ bool __scst_check_blocked_dev(struct scst_cmd *cmd)
if (dev->block_count > 0) {
TRACE_BLOCK("Delaying cmd %p due to blocking "
"(tag %llu, op %s, dev %s)", cmd,
(long long unsigned int)cmd->tag,
(unsigned long long int)cmd->tag,
scst_get_opcode_name(cmd), dev->virt_name);
goto out_block;
} else if ((cmd->op_flags & SCST_STRICTLY_SERIALIZED) == SCST_STRICTLY_SERIALIZED) {
TRACE_BLOCK("cmd %p (tag %llu, op %s): blocking further "
"cmds on dev %s due to strict serialization", cmd,
(long long unsigned int)cmd->tag,
(unsigned long long int)cmd->tag,
scst_get_opcode_name(cmd), dev->virt_name);
scst_block_dev(dev);
if (dev->on_dev_cmd_count > 1) {
@@ -8804,7 +8804,7 @@ bool __scst_check_blocked_dev(struct scst_cmd *cmd)
} else if ((dev->dev_double_ua_possible) ||
((cmd->op_flags & SCST_SERIALIZED) != 0)) {
TRACE_BLOCK("cmd %p (tag %llu, op %s): blocking further cmds "
"on dev %s due to %s", cmd, (long long unsigned int)cmd->tag,
"on dev %s due to %s", cmd, (unsigned long long int)cmd->tag,
scst_get_opcode_name(cmd), dev->virt_name,
dev->dev_double_ua_possible ? "possible double reset UA" :
"serialized cmd");
@@ -9253,13 +9253,13 @@ void scst_xmit_process_aborted_cmd(struct scst_cmd *cmd)
if (test_bit(SCST_CMD_DEVICE_TAS, &cmd->cmd_flags)) {
TRACE_MGMT_DBG("Flag ABORTED OTHER set for cmd %p "
"(tag %llu), returning TASK ABORTED ", cmd,
(long long unsigned int)cmd->tag);
(unsigned long long int)cmd->tag);
scst_set_cmd_error_status(cmd, SAM_STAT_TASK_ABORTED);
} else {
TRACE_MGMT_DBG("Flag ABORTED OTHER set for cmd %p "
"(tag %llu), aborting without delivery or "
"notification",
cmd, (long long unsigned int)cmd->tag);
cmd, (unsigned long long int)cmd->tag);
/*
* There is no need to check/requeue possible UA,
* because, if it exists, it will be delivered
scst/src/scst_proc.c
+1 -1
View File
@@ -2546,7 +2546,7 @@ static int scst_groups_devices_show(struct seq_file *seq, void *v)
list_for_each_entry(acg_dev, &acg->acg_dev_list, acg_dev_list_entry) {
seq_printf(seq, "%-60s%-13lld%s\n",
acg_dev->dev->virt_name,
(long long unsigned int)acg_dev->lun,
(unsigned long long int)acg_dev->lun,
acg_dev->acg_dev_rd_only ? "RO" : "");
}
mutex_unlock(&scst_mutex);
scst/src/scst_targ.c
+40 -40
View File
@@ -157,7 +157,7 @@ static void scst_check_unblock_dev(struct scst_cmd *cmd)
if (unlikely(cmd->unblock_dev)) {
TRACE_BLOCK("cmd %p (tag %llu): unblocking dev %s", cmd,
(long long unsigned int)cmd->tag, dev->virt_name);
(unsigned long long int)cmd->tag, dev->virt_name);
cmd->unblock_dev = 0;
scst_unblock_dev(dev);
} else if (unlikely(dev->strictly_serialized_cmd_waiting)) {
@@ -416,9 +416,9 @@ void scst_cmd_init_done(struct scst_cmd *cmd,
TRACE_DBG("Preferred context: %d (cmd %p)", pref_context, cmd);
TRACE(TRACE_SCSI, "NEW CDB: len %d, lun %lld, initiator %s, "
"target %s, queue_type %x, tag %llu (cmd %p, sess %p)",
cmd->cdb_len, (long long unsigned int)cmd->lun,
cmd->cdb_len, (unsigned long long int)cmd->lun,
cmd->sess->initiator_name, cmd->tgt->tgt_name, cmd->queue_type,
(long long unsigned int)cmd->tag, cmd, sess);
(unsigned long long int)cmd->tag, cmd, sess);
PRINT_BUFF_FLAG(TRACE_SCSI, "CDB", cmd->cdb, cmd->cdb_len);
#ifdef CONFIG_SCST_EXTRACHECKS
@@ -1259,7 +1259,7 @@ void scst_restart_cmd(struct scst_cmd *cmd, int status,
TRACE_DBG("Preferred context: %d", pref_context);
TRACE_DBG("tag=%llu, status=%#x",
(long long unsigned int)scst_cmd_get_tag(cmd),
(unsigned long long int)scst_cmd_get_tag(cmd),
status);
#ifdef CONFIG_SCST_EXTRACHECKS
@@ -2348,7 +2348,7 @@ static int scst_reserve_local(struct scst_cmd *cmd)
if ((cmd->cdb[0] == RESERVE_10) && (cmd->cdb[2] & SCST_RES_3RDPTY)) {
PRINT_ERROR("RESERVE_10: 3rdPty RESERVE not implemented "
"(lun=%lld)", (long long unsigned int)cmd->lun);
"(lun=%lld)", (unsigned long long int)cmd->lun);
scst_set_invalid_field_in_cdb(cmd, 2,
SCST_INVAL_FIELD_BIT_OFFS_VALID | 4);
goto out_done;
@@ -2990,7 +2990,7 @@ static int scst_do_real_exec(struct scst_cmd *cmd)
if (unlikely(scsi_dev == NULL)) {
PRINT_ERROR("Command for virtual device must be "
"processed by device handler (LUN %lld)!",
(long long unsigned int)cmd->lun);
(unsigned long long int)cmd->lun);
goto out_error;
}
@@ -3334,7 +3334,7 @@ static int scst_exec_check_sn(struct scst_cmd **active_cmd)
/* Necessary to allow aborting out of sn cmds */
TRACE_MGMT_DBG("Aborting out of sn cmd %p "
"(tag %llu, sn %u)", cmd,
(long long unsigned)cmd->tag, cmd->sn);
(unsigned long long)cmd->tag, cmd->sn);
order_data->def_cmd_count--;
scst_set_cmd_abnormal_done_state(cmd);
res = SCST_CMD_STATE_RES_CONT_SAME;
@@ -3414,7 +3414,7 @@ static int scst_check_sense(struct scst_cmd *cmd)
"detected for device %p", dev);
TRACE_DBG("Retrying cmd"
" %p (tag %llu)", cmd,
(long long unsigned)cmd->tag);
(unsigned long long)cmd->tag);
cmd->status = 0;
cmd->msg_status = 0;
@@ -3609,7 +3609,7 @@ next:
PRINT_INFO("NormACA set for device: "
"lun=%lld, type 0x%02x. Clear it, "
"since it's unsupported.",
(long long unsigned int)cmd->lun,
(unsigned long long int)cmd->lun,
buffer[0]);
}
#endif
@@ -3632,7 +3632,7 @@ next:
(cmd->cdb[0] == MODE_SELECT_10) ||
(cmd->cdb[0] == LOG_SELECT))) {
TRACE(TRACE_SCSI, "MODE/LOG SELECT succeeded (LUN %lld)",
(long long unsigned int)cmd->lun);
(unsigned long long int)cmd->lun);
cmd->state = SCST_CMD_STATE_MODE_SELECT_CHECKS;
goto out;
}
@@ -3645,7 +3645,7 @@ next:
SCST_SENSE_ASCx_VALID,
0, 0x2a, 0x01)) {
TRACE(TRACE_SCSI, "MODE PARAMETERS CHANGED UA (lun "
"%lld)", (long long unsigned int)cmd->lun);
"%lld)", (unsigned long long int)cmd->lun);
cmd->state = SCST_CMD_STATE_MODE_SELECT_CHECKS;
goto out;
}
@@ -3682,7 +3682,7 @@ static int scst_mode_select_checks(struct scst_cmd *cmd)
TRACE(TRACE_SCSI, "MODE/LOG SELECT succeeded, "
"setting the SELECT UA (lun=%lld)",
(long long unsigned int)cmd->lun);
(unsigned long long int)cmd->lun);
spin_lock_bh(&dev->dev_lock);
if (cmd->cdb[0] == LOG_SELECT) {
@@ -3728,7 +3728,7 @@ static int scst_mode_select_checks(struct scst_cmd *cmd)
TRACE(TRACE_SCSI, "Possible parameters changed UA %x "
"(LUN %lld): getting new parameters", cmd->sense[12],
(long long unsigned int)cmd->lun);
(unsigned long long int)cmd->lun);
scst_obtain_device_parameters(cmd->dev, NULL);
} else
@@ -3885,7 +3885,7 @@ again:
if (unlikely(test_bit(SCST_CMD_NO_RESP, &cmd->cmd_flags))) {
EXTRACHECKS_BUG_ON(!test_bit(SCST_CMD_ABORTED, &cmd->cmd_flags));
TRACE_MGMT_DBG("Flag NO_RESP set for cmd %p (tag %llu), "
"skipping", cmd, (long long unsigned int)cmd->tag);
"skipping", cmd, (unsigned long long int)cmd->tag);
cmd->state = SCST_CMD_STATE_FINISHED;
goto out_same;
}
@@ -4390,7 +4390,7 @@ static int scst_translate_lun(struct scst_cmd *cmd)
if (likely(!test_bit(SCST_FLAG_SUSPENDED, &scst_flags))) {
TRACE_DBG("Finding tgt_dev for cmd %p (lun %lld)", cmd,
(long long unsigned int)cmd->lun);
(unsigned long long int)cmd->lun);
res = -1;
tgt_dev = scst_lookup_tgt_dev(cmd->sess, cmd->lun);
if (tgt_dev) {
@@ -4407,7 +4407,7 @@ static int scst_translate_lun(struct scst_cmd *cmd)
} else {
PRINT_INFO("Dev handler for device %lld is NULL, "
"the device will not be visible remotely",
(long long unsigned int)cmd->lun);
(unsigned long long int)cmd->lun);
nul_dev = true;
}
}
@@ -4416,7 +4416,7 @@ static int scst_translate_lun(struct scst_cmd *cmd)
TRACE(TRACE_MINOR,
"tgt_dev for LUN %lld not found, command to "
"unexisting LU (initiator %s, target %s)?",
(long long unsigned int)cmd->lun,
(unsigned long long int)cmd->lun,
cmd->sess->initiator_name, cmd->tgt->tgt_name);
}
scst_put(cmd->cpu_cmd_counter);
@@ -4559,7 +4559,7 @@ restart:
}
} else {
TRACE_MGMT_DBG("Aborting not inited cmd %p (tag %llu)",
cmd, (long long unsigned int)cmd->tag);
cmd, (unsigned long long int)cmd->tag);
scst_set_cmd_abnormal_done_state(cmd);
}
@@ -4781,7 +4781,7 @@ void scst_process_active_cmd(struct scst_cmd *cmd, bool atomic)
res = SCST_CMD_STATE_RES_CONT_NEXT;
TRACE_MGMT_DBG("Skipping cmd %p (tag %llu), "
"because of TM DBG delay", cmd,
(long long unsigned int)cmd->tag);
(unsigned long long int)cmd->tag);
break;
}
res = scst_exec_check_sn(&cmd);
@@ -5029,7 +5029,7 @@ static int scst_mgmt_translate_lun(struct scst_mgmt_cmd *mcmd)
TRACE_ENTRY();
TRACE_DBG("Finding tgt_dev for mgmt cmd %p (lun %lld)", mcmd,
(long long unsigned int)mcmd->lun);
(unsigned long long int)mcmd->lun);
res = scst_get_mgmt(mcmd);
if (unlikely(res != 0))
@@ -5060,7 +5060,7 @@ void scst_done_cmd_mgmt(struct scst_cmd *cmd)
TRACE_ENTRY();
TRACE_MGMT_DBG("cmd %p done (tag %llu)",
cmd, (long long unsigned int)cmd->tag);
cmd, (unsigned long long int)cmd->tag);
spin_lock_irqsave(&scst_mcmd_lock, flags);
@@ -5216,7 +5216,7 @@ void scst_finish_cmd_mgmt(struct scst_cmd *cmd)
TRACE_ENTRY();
TRACE(TRACE_MGMT, "Aborted cmd %p finished (tag %llu, ref %d)", cmd,
(long long unsigned int)cmd->tag, atomic_read(&cmd->cmd_ref));
(unsigned long long int)cmd->tag, atomic_read(&cmd->cmd_ref));
spin_lock_irqsave(&scst_mcmd_lock, flags);
@@ -5317,7 +5317,7 @@ void scst_abort_cmd(struct scst_cmd *cmd, struct scst_mgmt_cmd *mcmd,
EXTRACHECKS_BUG_ON(!mcmd);
TRACE(TRACE_SCSI|TRACE_MGMT_DEBUG, "Aborting cmd %p (tag %llu, op %s)",
cmd, (long long unsigned int)cmd->tag, scst_get_opcode_name(cmd));
cmd, (unsigned long long int)cmd->tag, scst_get_opcode_name(cmd));
/* To protect from concurrent aborts */
spin_lock_irqsave(&other_ini_lock, flags);
@@ -5399,7 +5399,7 @@ void scst_abort_cmd(struct scst_cmd *cmd, struct scst_mgmt_cmd *mcmd,
if (cmd->sent_for_exec && !cmd->done) {
TRACE_MGMT_DBG("cmd %p (tag %llu) is being executed",
cmd, (long long unsigned int)cmd->tag);
cmd, (unsigned long long int)cmd->tag);
mstb->done_counted = 1;
mcmd->cmd_done_wait_count++;
}
@@ -5425,7 +5425,7 @@ void scst_abort_cmd(struct scst_cmd *cmd, struct scst_mgmt_cmd *mcmd,
"deferring ABORT (cmd_done_wait_count %d, "
"cmd_finish_wait_count %d, internal %d, mcmd "
"fn %d (mcmd %p), initiator %s, target %s)",
cmd, (long long unsigned int)cmd->tag,
cmd, (unsigned long long int)cmd->tag,
cmd->sn, cmd->state, scst_get_opcode_name(cmd),
(long)(jiffies - cmd->start_time) / HZ,
cmd->timeout / HZ, mcmd->cmd_done_wait_count,
@@ -5649,7 +5649,7 @@ static int scst_abort_task_set(struct scst_mgmt_cmd *mcmd)
struct scst_tgt_dev *tgt_dev = mcmd->mcmd_tgt_dev;
TRACE(TRACE_MGMT, "Aborting task set (lun=%lld, mcmd=%p)",
(long long unsigned int)tgt_dev->lun, mcmd);
(unsigned long long int)tgt_dev->lun, mcmd);
__scst_abort_task_set(mcmd, tgt_dev);
@@ -5681,7 +5681,7 @@ static bool scst_is_cmd_belongs_to_dev(struct scst_cmd *cmd,
TRACE_ENTRY();
TRACE_DBG("Finding match for dev %s and cmd %p (lun %lld)",
dev->virt_name, cmd, (long long unsigned int)cmd->lun);
dev->virt_name, cmd, (unsigned long long int)cmd->lun);
tgt_dev = scst_lookup_tgt_dev(cmd->sess, cmd->lun);
res = tgt_dev && tgt_dev->dev == dev;
@@ -5701,7 +5701,7 @@ static int scst_clear_task_set(struct scst_mgmt_cmd *mcmd)
TRACE_ENTRY();
TRACE(TRACE_MGMT, "Clearing task set (lun=%lld, mcmd=%p)",
(long long unsigned int)mcmd->lun, mcmd);
(unsigned long long int)mcmd->lun, mcmd);
#if 0 /* we are SAM-3 */
/*
@@ -5816,7 +5816,7 @@ static int scst_mgmt_cmd_init(struct scst_mgmt_cmd *mcmd)
if (cmd == NULL) {
TRACE_MGMT_DBG("ABORT TASK: command "
"for tag %llu not found",
(long long unsigned int)mcmd->tag);
(unsigned long long int)mcmd->tag);
scst_mgmt_cmd_set_status(mcmd, SCST_MGMT_STATUS_TASK_NOT_EXIST);
spin_unlock_irq(&sess->sess_list_lock);
res = scst_set_mcmd_next_state(mcmd);
@@ -5828,7 +5828,7 @@ static int scst_mgmt_cmd_init(struct scst_mgmt_cmd *mcmd)
mcmd->cpu_cmd_counter = scst_get();
spin_unlock_irq(&sess->sess_list_lock);
TRACE_DBG("Cmd to abort %p for tag %llu found (tgt_dev %p)",
cmd, (long long unsigned int)mcmd->tag, tgt_dev);
cmd, (unsigned long long int)mcmd->tag, tgt_dev);
mcmd->cmd_to_abort = cmd;
sBUG_ON(mcmd->mcmd_tgt_dev != NULL);
mcmd->mcmd_tgt_dev = tgt_dev;
@@ -5870,7 +5870,7 @@ static int scst_mgmt_cmd_init(struct scst_mgmt_cmd *mcmd)
mcmd->state = SCST_MCMD_STATE_EXEC;
else if (rc < 0) {
PRINT_ERROR("Corresponding device for LUN %lld not "
"found", (long long unsigned int)mcmd->lun);
"found", (unsigned long long int)mcmd->lun);
scst_mgmt_cmd_set_status(mcmd, SCST_MGMT_STATUS_LUN_NOT_EXIST);
res = scst_set_mcmd_next_state(mcmd);
} else
@@ -6000,7 +6000,7 @@ static int scst_lun_reset(struct scst_mgmt_cmd *mcmd)
TRACE_ENTRY();
TRACE(TRACE_MGMT, "Resetting LUN %lld (mcmd %p)",
(long long unsigned int)tgt_dev->lun, mcmd);
(unsigned long long int)tgt_dev->lun, mcmd);
mcmd->needs_unblocking = 1;
@@ -6185,21 +6185,21 @@ static int scst_abort_task(struct scst_mgmt_cmd *mcmd)
TRACE_MGMT_DBG("Aborting task (cmd %p, sn %d, set %d, tag %llu, "
"queue_type %x)", cmd, cmd->sn, cmd->sn_set,
(long long unsigned int)mcmd->tag, cmd->queue_type);
(unsigned long long int)mcmd->tag, cmd->queue_type);
if (mcmd->lun_set && (mcmd->lun != cmd->lun)) {
PRINT_ERROR("ABORT TASK: LUN mismatch: mcmd LUN %llx, "
"cmd LUN %llx, cmd tag %llu",
(long long unsigned int)mcmd->lun,
(long long unsigned int)cmd->lun,
(long long unsigned int)mcmd->tag);
(unsigned long long int)mcmd->lun,
(unsigned long long int)cmd->lun,
(unsigned long long int)mcmd->tag);
scst_mgmt_cmd_set_status(mcmd, SCST_MGMT_STATUS_REJECTED);
} else if (mcmd->cmd_sn_set &&
(scst_sn_before(mcmd->cmd_sn, cmd->tgt_sn) ||
(mcmd->cmd_sn == cmd->tgt_sn))) {
PRINT_ERROR("ABORT TASK: SN mismatch: mcmd SN %x, "
"cmd SN %x, cmd tag %llu", mcmd->cmd_sn,
cmd->tgt_sn, (long long unsigned int)mcmd->tag);
cmd->tgt_sn, (unsigned long long int)mcmd->tag);
scst_mgmt_cmd_set_status(mcmd, SCST_MGMT_STATUS_REJECTED);
} else {
spin_lock_irq(&cmd->sess->sess_list_lock);
@@ -6758,9 +6758,9 @@ int scst_rx_mgmt_fn(struct scst_session *sess,
TRACE_MGMT_DBG("sess=%p, tag_set %d, tag %lld, lun_set %d, "
"lun=%lld, cmd_sn_set %d, cmd_sn %d, priv %p", sess,
params->tag_set,
(long long unsigned int)params->tag,
(unsigned long long int)params->tag,
params->lun_set,
(long long unsigned int)mcmd->lun,
(unsigned long long int)mcmd->lun,
params->cmd_sn_set,
params->cmd_sn,
params->tgt_priv);
@@ -7451,7 +7451,7 @@ static struct scst_cmd *__scst_find_cmd_by_tag(struct scst_session *sess,
/* ToDo: hash list */
TRACE_DBG("%s (sess=%p, tag=%llu)", "Searching in sess cmd list",
sess, (long long unsigned int)tag);
sess, (unsigned long long int)tag);
list_for_each_entry(cmd, &sess->sess_cmd_list,
sess_cmd_list_entry) {