The patch below fixes the following class of checkpatch warnings:
authorvlnb <vlnb@d57e44dd-8a1f-0410-8b47-8ef2f437770f>
Mon, 6 Oct 2008 17:22:17 +0000 (17:22 +0000)
committervlnb <vlnb@d57e44dd-8a1f-0410-8b47-8ef2f437770f>
Mon, 6 Oct 2008 17:22:17 +0000 (17:22 +0000)
WARNING: %Ld/%Lu are not-standard C, use %lld/%llu

This patch has been tested by verifying that the SCST sources still compile
fine (make -s clean && make -C srpt -s clean && make -s scst iscsi-scst && make -C srpt -s).

Signed-off-by: Bart Van Assche <bart.vanassche@gmail.com>
git-svn-id: https://scst.svn.sourceforge.net/svnroot/scst/trunk@514 d57e44dd-8a1f-0410-8b47-8ef2f437770f

iscsi-scst/kernel/conn.c
iscsi-scst/kernel/iscsi.c
iscsi-scst/kernel/session.c
qla2x00t/qla2x00-target/qla2x00t.c
scst/src/dev_handlers/scst_user.c
scst/src/dev_handlers/scst_vdisk.c
scst/src/scst_lib.c
scst/src/scst_proc.c
scst/src/scst_targ.c

index 8bf5256..d4fb407 100644 (file)
@@ -252,7 +252,7 @@ static void conn_rsp_timer_fn(unsigned long arg)
                if (unlikely(time_after_eq(jiffies, wr_cmd->write_timeout))) {
                        if (!conn->closing) {
                                PRINT_ERROR("Timeout sending data to initiator "
-                                       "%s (SID %Lx), closing connection",
+                                       "%s (SID %llx), closing connection",
                                        conn->session->initiator_name,
                                        (long long unsigned int)conn->session->sid);
                                mark_conn_closed(conn);
index dc9b433..eb97431 100644 (file)
@@ -1637,7 +1637,7 @@ static int cmnd_abort(struct iscsi_cmnd *req)
 
                if (req_hdr->lun != hdr->lun) {
                         PRINT_ERROR("ABORT TASK: LUN mismatch: req LUN "
-                                    "%Lx, cmd LUN %Lx, rtt %u",
+                                    "%llx, cmd LUN %llx, rtt %u",
                                     (long long unsigned int)req_hdr->lun,
                                     (long long unsigned int)hdr->lun,
                                     req_hdr->rtt);
index e135d17..a9f6da2 100644 (file)
@@ -115,7 +115,7 @@ int session_add(struct iscsi_target *target, struct session_info *info)
 
        session = session_lookup(target, info->sid);
        if (session) {
-               PRINT_ERROR("Attempt to add session with existing SID %Lx",
+               PRINT_ERROR("Attempt to add session with existing SID %llx",
                        info->sid);
                return err;
        }
index 0f98e06..64e4b6b 100644 (file)
@@ -671,7 +671,7 @@ static int q2t_xmit_response(struct scst_cmd *scst_cmd)
        uint16_t full_req_cnt;
 
        TRACE_ENTRY();
-       TRACE(TRACE_SCSI, "tag=%Ld", scst_cmd_get_tag(scst_cmd));
+       TRACE(TRACE_SCSI, "tag=%lld", scst_cmd_get_tag(scst_cmd));
 
 #ifdef CONFIG_QLA_TGT_DEBUG_WORK_IN_THREAD
        if (scst_cmd_atomic(scst_cmd))
@@ -688,7 +688,7 @@ static int q2t_xmit_response(struct scst_cmd *scst_cmd)
                scsi_qla_host_t *ha = sess->tgt->ha;
 
                TRACE(TRACE_MGMT_MINOR, "qla2x00tgt(%ld): terminating exchange "
-                       "for aborted scst_cmd=%p (tag=%Ld)",
+                       "for aborted scst_cmd=%p (tag=%lld)",
                        ha->instance, scst_cmd, scst_cmd_get_tag(scst_cmd));
 
                scst_set_delivery_status(scst_cmd, SCST_CMD_DELIVERY_ABORTED);
@@ -828,7 +828,7 @@ static int q2t_rdy_to_xfer(struct scst_cmd *scst_cmd)
        struct q2t_prm prm;
 
        TRACE_ENTRY();
-       TRACE(TRACE_SCSI, "tag=%Ld", scst_cmd_get_tag(scst_cmd));
+       TRACE(TRACE_SCSI, "tag=%lld", scst_cmd_get_tag(scst_cmd));
 
 #ifdef CONFIG_QLA_TGT_DEBUG_WORK_IN_THREAD
        if (scst_cmd_atomic(scst_cmd))
@@ -974,7 +974,7 @@ static void q2t_on_free_cmd(struct scst_cmd *scst_cmd)
        struct q2t_cmd *cmd = (struct q2t_cmd *)scst_cmd_get_tgt_priv(scst_cmd);
 
        TRACE_ENTRY();
-       TRACE(TRACE_SCSI, "END Command tag %Ld", scst_cmd_get_tag(scst_cmd));
+       TRACE(TRACE_SCSI, "END Command tag %lld", scst_cmd_get_tag(scst_cmd));
 
        scst_cmd_set_tgt_priv(scst_cmd, NULL);
 
@@ -1266,7 +1266,7 @@ static int q2t_do_send_cmd_to_scst(scsi_qla_host_t *ha, struct q2t_cmd *cmd)
 #endif
 
        TRACE_DBG("Context %x", context);
-       TRACE(TRACE_SCSI, "START Command (tag %Ld)", scst_cmd_get_tag(cmd->scst_cmd));
+       TRACE(TRACE_SCSI, "START Command (tag %lld)", scst_cmd_get_tag(cmd->scst_cmd));
        scst_cmd_init_done(cmd->scst_cmd, context);
 
 out:
index 27d84a1..58e9a4a 100644 (file)
@@ -1122,13 +1122,13 @@ static int dev_user_process_reply_alloc(struct scst_user_cmd *ucmd,
 
        TRACE_ENTRY();
 
-       TRACE_DBG("ucmd %p, pbuf %Lx", ucmd, reply->alloc_reply.pbuf);
+       TRACE_DBG("ucmd %p, pbuf %llx", ucmd, reply->alloc_reply.pbuf);
 
        if (likely(reply->alloc_reply.pbuf != 0)) {
                int pages;
                if (ucmd->buff_cached) {
                        if (unlikely((reply->alloc_reply.pbuf & ~PAGE_MASK) != 0)) {
-                               PRINT_ERROR("Supplied pbuf %Lx isn't "
+                               PRINT_ERROR("Supplied pbuf %llx isn't "
                                        "page aligned", reply->alloc_reply.pbuf);
                                goto out_hwerr;
                        }
@@ -1180,7 +1180,7 @@ static int dev_user_process_reply_parse(struct scst_user_cmd *ucmd,
                goto out_inval;
 
        TRACE_DBG("ucmd %p, queue_type %x, data_direction, %x, bufflen %d, "
-               "data_len %d, pbuf %Lx", ucmd, preply->queue_type,
+               "data_len %d, pbuf %llx", ucmd, preply->queue_type,
                preply->data_direction, preply->bufflen, preply->data_len,
                reply->alloc_reply.pbuf);
 
@@ -1278,7 +1278,7 @@ static int dev_user_process_reply_exec(struct scst_user_cmd *ucmd,
                                goto out_busy;
                        if (ucmd->buff_cached) {
                                if (unlikely((ereply->pbuf & ~PAGE_MASK) != 0)) {
-                                       PRINT_ERROR("Supplied pbuf %Lx isn't "
+                                       PRINT_ERROR("Supplied pbuf %llx isn't "
                                                "page aligned", ereply->pbuf);
                                        goto out_hwerr;
                                }
@@ -1665,7 +1665,7 @@ static int dev_user_reply_get_cmd(struct file *file, void __user *arg)
        if (res < 0)
                goto out_up;
 
-       TRACE_DBG("ureply %Ld (dev %s)", (long long unsigned int)ureply,
+       TRACE_DBG("ureply %lld (dev %s)", (long long unsigned int)ureply,
                dev->name);
 
        cmd = kmem_cache_alloc(user_get_cmd_cachep, GFP_KERNEL);
@@ -2241,7 +2241,7 @@ static int dev_user_attach_tgt(struct scst_tgt_dev *tgt_dev)
        ucmd->user_cmd.sess.initiator_name[
                sizeof(ucmd->user_cmd.sess.initiator_name)-1] = '\0';
 
-       TRACE_MGMT_DBG("Preparing ATTACH_SESS %p (h %d, sess_h %Lx, LUN %Lx, "
+       TRACE_MGMT_DBG("Preparing ATTACH_SESS %p (h %d, sess_h %llx, LUN %llx, "
                "threads_num %d, rd_only_flag %d, initiator %s)", ucmd, ucmd->h,
                ucmd->user_cmd.sess.sess_h, ucmd->user_cmd.sess.lun,
                ucmd->user_cmd.sess.threads_num, ucmd->user_cmd.sess.rd_only,
@@ -2294,7 +2294,7 @@ static void dev_user_detach_tgt(struct scst_tgt_dev *tgt_dev)
        if (ucmd == NULL)
                goto out;
 
-       TRACE_MGMT_DBG("Preparing DETACH_SESS %p (h %d, sess_h %Lx)", ucmd,
+       TRACE_MGMT_DBG("Preparing DETACH_SESS %p (h %d, sess_h %llx)", ucmd,
                ucmd->h, ucmd->user_cmd.sess.sess_h);
 
        ucmd->user_cmd.cmd_h = ucmd->h;
index c92d084..4d9e3a1 100644 (file)
@@ -468,7 +468,7 @@ static int vdisk_attach(struct scst_device *dev)
                        filp_close(fd, NULL);
                }
                virt_dev->file_size = err;
-               TRACE_DBG("size of file: %Ld", (long long unsigned int)err);
+               TRACE_DBG("size of file: %lld", (long long unsigned int)err);
        } else
                virt_dev->file_size = 0;
 
@@ -482,7 +482,7 @@ static int vdisk_attach(struct scst_device *dev)
 
        if (!virt_dev->cdrom_empty) {
                PRINT_INFO("Attached SCSI target virtual %s %s "
-                     "(file=\"%s\", fs=%LdMB, bs=%d, nblocks=%Ld, cyln=%Ld%s)",
+                     "(file=\"%s\", fs=%lldMB, bs=%d, nblocks=%lld, cyln=%lld%s)",
                      (dev->handler->type == TYPE_DISK) ? "disk" : "cdrom",
                      virt_dev->name, virt_dev->file_name,
                      virt_dev->file_size >> 20, virt_dev->block_size,
@@ -769,14 +769,14 @@ static int vdisk_do_job(struct scst_cmd *cmd)
        }
 
        loff = (loff_t)lba_start << virt_dev->block_shift;
-       TRACE_DBG("cmd %p, lba_start %Ld, loff %Ld, data_len %Ld", cmd,
+       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);
        if (unlikely(loff < 0) || unlikely(data_len < 0) ||
            unlikely((loff + data_len) > virt_dev->file_size)) {
                PRINT_INFO("Access beyond the end of the device "
-                       "(%lld of %lld, len %Ld)",
+                       "(%lld of %lld, len %lld)",
                           (long long unsigned int)loff,
                           (long long unsigned int)virt_dev->file_size,
                           (long long unsigned int)data_len);
@@ -791,8 +791,8 @@ static int vdisk_do_job(struct scst_cmd *cmd)
        case WRITE_16:
                fua = (cdb[1] & 0x8);
                if (fua) {
-                       TRACE(TRACE_ORDER, "FUA: loff=%Ld, "
-                               "data_len=%Ld", (long long unsigned int)loff,
+                       TRACE(TRACE_ORDER, "FUA: loff=%lld, "
+                               "data_len=%lld", (long long unsigned int)loff,
                                (long long unsigned int)data_len);
                }
                break;
@@ -823,7 +823,7 @@ static int vdisk_do_job(struct scst_cmd *cmd)
                        ftgt_dev->last_write_cmd_queue_type = cmd->queue_type;
                        if (vdisk_need_pre_sync(cmd->queue_type, last_queue_type)) {
                                TRACE(TRACE_ORDER, "ORDERED "
-                                     "WRITE(%d): loff=%Ld, data_len=%Ld",
+                                     "WRITE(%d): loff=%lld, data_len=%lld",
                                      cmd->queue_type, (long long unsigned int)loff,
                                      (long long unsigned int)data_len);
                                do_fsync = 1;
@@ -858,7 +858,7 @@ static int vdisk_do_job(struct scst_cmd *cmd)
                        ftgt_dev->last_write_cmd_queue_type = cmd->queue_type;
                        if (vdisk_need_pre_sync(cmd->queue_type, last_queue_type)) {
                                TRACE(TRACE_ORDER, "ORDERED "
-                                     "WRITE_VERIFY(%d): loff=%Ld, data_len=%Ld",
+                                     "WRITE_VERIFY(%d): loff=%lld, data_len=%lld",
                                      cmd->queue_type, (long long unsigned int)loff,
                                      (long long unsigned int)data_len);
                                do_fsync = 1;
@@ -883,7 +883,7 @@ static int vdisk_do_job(struct scst_cmd *cmd)
        {
                int immed = cdb[1] & 0x2;
                TRACE(TRACE_ORDER, "SYNCHRONIZE_CACHE: "
-                       "loff=%Ld, data_len=%Ld, immed=%d", (long long unsigned int)loff,
+                       "loff=%lld, data_len=%lld, immed=%d", (long long unsigned int)loff,
                        (long long unsigned int)data_len, immed);
                if (immed) {
                        scst_cmd_get(cmd);
@@ -2046,7 +2046,7 @@ static void vdisk_exec_read(struct scst_cmd *cmd,
                else
                        err = default_llseek(fd, loff, 0/*SEEK_SET*/);
                if (err != loff) {
-                       PRINT_ERROR("lseek trouble %Ld != %Ld",
+                       PRINT_ERROR("lseek trouble %lld != %lld",
                                    (long long unsigned int)err,
                                    (long long unsigned int)loff);
                        scst_set_cmd_error(cmd, SCST_LOAD_SENSE(scst_sense_hardw_error));
@@ -2061,7 +2061,7 @@ static void vdisk_exec_read(struct scst_cmd *cmd,
        }
 
        if ((err < 0) || (err < full_len)) {
-               PRINT_ERROR("readv() returned %Ld from %zd",
+               PRINT_ERROR("readv() returned %lld from %zd",
                            (long long unsigned int)err,
                            full_len);
                if (err == -EAGAIN)
@@ -2138,7 +2138,7 @@ restart:
                else
                        err = default_llseek(fd, loff, 0 /*SEEK_SET */);
                if (err != loff) {
-                       PRINT_ERROR("lseek trouble %Ld != %Ld",
+                       PRINT_ERROR("lseek trouble %lld != %lld",
                                    (long long unsigned int)err,
                                    (long long unsigned int)loff);
                        scst_set_cmd_error(cmd,
@@ -2156,7 +2156,7 @@ restart:
        }
 
        if (err < 0) {
-               PRINT_ERROR("write() returned %Ld from %zd",
+               PRINT_ERROR("write() returned %lld from %zd",
                            (long long unsigned int)err,
                            full_len);
                if (err == -EAGAIN)
@@ -2431,7 +2431,7 @@ static void vdisk_exec_verify(struct scst_cmd *cmd,
                else
                        err = default_llseek(fd, loff, 0/*SEEK_SET*/);
                if (err != loff) {
-                       PRINT_ERROR("lseek trouble %Ld != %Ld",
+                       PRINT_ERROR("lseek trouble %lld != %lld",
                                    (long long unsigned int)err,
                                    (long long unsigned int)loff);
                        scst_set_cmd_error(cmd, SCST_LOAD_SENSE(scst_sense_hardw_error));
@@ -2465,7 +2465,7 @@ static void vdisk_exec_verify(struct scst_cmd *cmd,
                else
                        err = len_mem;
                if ((err < 0) || (err < len_mem)) {
-                       PRINT_ERROR("verify() returned %Ld from %zd",
+                       PRINT_ERROR("verify() returned %lld from %zd",
                                    (long long unsigned int)err, len_mem);
                        if (err == -EAGAIN)
                                scst_set_busy(cmd);
@@ -3150,7 +3150,7 @@ static int vcdrom_change(char *p, char *name)
 
        if (!virt_dev->cdrom_empty) {
                PRINT_INFO("Changed SCSI target virtual cdrom %s "
-                       "(file=\"%s\", fs=%LdMB, bs=%d, nblocks=%Ld, cyln=%Ld%s)",
+                       "(file=\"%s\", fs=%lldMB, bs=%d, nblocks=%lld, cyln=%lld%s)",
                        virt_dev->name, virt_dev->file_name,
                        virt_dev->file_size >> 20, virt_dev->block_size,
                        (long long unsigned int)virt_dev->nblocks,
index 523f574..22d5a8d 100644 (file)
@@ -516,12 +516,12 @@ static struct scst_tgt_dev *scst_alloc_add_tgt_dev(struct scst_session *sess,
 
        if (dev->scsi_dev != NULL) {
                TRACE_MGMT_DBG("host=%d, channel=%d, id=%d, lun=%d, "
-                     "SCST lun=%Ld", dev->scsi_dev->host->host_no,
+                     "SCST lun=%lld", dev->scsi_dev->host->host_no,
                      dev->scsi_dev->channel, dev->scsi_dev->id,
                      dev->scsi_dev->lun,
                      (long long unsigned int)tgt_dev->lun);
        } else {
-               TRACE_MGMT_DBG("Virtual device %s on SCST lun=%Ld",
+               TRACE_MGMT_DBG("Virtual device %s on SCST lun=%lld",
                               dev->virt_name,
                               (long long unsigned int)tgt_dev->lun);
        }
@@ -788,13 +788,13 @@ int scst_acg_add_dev(struct scst_acg *acg, struct scst_device *dev,
 out:
        if (res == 0) {
                if (dev->virt_name != NULL) {
-                       PRINT_INFO("Added device %s to group %s (LUN %Ld, "
+                       PRINT_INFO("Added device %s to group %s (LUN %lld, "
                                "rd_only %d)", dev->virt_name, acg->acg_name,
                                (long long unsigned int)lun,
                                read_only);
                } else {
                        PRINT_INFO("Added device %d:%d:%d:%d to group %s (LUN "
-                               "%Ld, rd_only %d)", dev->scsi_dev->host->host_no,
+                               "%lld, rd_only %d)", dev->scsi_dev->host->host_no,
                                dev->scsi_dev->channel, dev->scsi_dev->id,
                                dev->scsi_dev->lun, acg->acg_name,
                                (long long unsigned int)lun,
@@ -1403,7 +1403,7 @@ void scst_free_cmd(struct scst_cmd *cmd)
 
        TRACE_ENTRY();
 
-       TRACE_DBG("Freeing cmd %p (tag %Lu)",
+       TRACE_DBG("Freeing cmd %p (tag %llu)",
                  cmd, (long long unsigned int)cmd->tag);
 
        if (unlikely(test_bit(SCST_CMD_ABORTED, &cmd->cmd_flags))) {
@@ -1462,7 +1462,7 @@ void scst_free_cmd(struct scst_cmd *cmd)
 #ifdef CONFIG_SCST_EXTRACHECKS
                if (unlikely(!cmd->sent_to_midlev)) {
                        PRINT_ERROR("Finishing not executed cmd %p (opcode "
-                            "%d, target %s, lun %Ld, sn %ld, expected_sn %ld)",
+                            "%d, target %s, lun %lld, sn %ld, expected_sn %ld)",
                             cmd, cmd->cdb[0], cmd->tgtt->name,
                             (long long unsigned int)cmd->lun,
                             cmd->sn, cmd->tgt_dev->expected_sn);
@@ -2577,7 +2577,7 @@ void scst_process_reset(struct scst_device *dev,
                list_for_each_entry(tgt_dev, &dev->dev_tgt_dev_list,
                                    dev_tgt_dev_list_entry) {
                        TRACE(TRACE_MGMT, "Clearing RESERVE'ation for tgt_dev "
-                               "lun %Ld",
+                               "lun %lld",
                                (long long unsigned int)tgt_dev->lun);
                        clear_bit(SCST_TGT_DEV_RESERVED,
                                  &tgt_dev->tgt_dev_flags);
@@ -2808,7 +2808,7 @@ void scst_free_all_UA(struct scst_tgt_dev *tgt_dev)
        TRACE_ENTRY();
 
        list_for_each_entry_safe(UA_entry, t, &tgt_dev->UA_list, UA_list_entry) {
-               TRACE_MGMT_DBG("Clearing UA for tgt_dev lun %Ld",
+               TRACE_MGMT_DBG("Clearing UA for tgt_dev lun %lld",
                               (long long unsigned int)tgt_dev->lun);
                list_del(&UA_entry->UA_list_entry);
                kfree(UA_entry);
index 6fa3a19..8d28b08 100644 (file)
@@ -411,7 +411,7 @@ static int lat_info_show(struct seq_file *seq, void *v)
                        processed_cmds = sess->processed_cmds;
                        spin_unlock_bh(&sess->meas_lock);
 
-                       TRACE_DBG("sess %p, scst_time %Ld, proc_time %Ld, "
+                       TRACE_DBG("sess %p, scst_time %lld, proc_time %lld, "
                                "processed_cmds %d", sess, scst_time,
                                proc_time, processed_cmds);
 
index 212ab6f..3629d43 100644 (file)
@@ -189,14 +189,14 @@ void scst_cmd_init_done(struct scst_cmd *cmd, int pref_context)
                struct timespec ts;
                getnstimeofday(&ts);
                cmd->start = scst_sec_to_nsec(ts.tv_sec) + ts.tv_nsec;
-               TRACE_DBG("cmd %p (sess %p): start %Ld (tv_sec %ld, "
+               TRACE_DBG("cmd %p (sess %p): start %lld (tv_sec %ld, "
                        "tv_nsec %ld)", cmd, sess, cmd->start, ts.tv_sec,
                        ts.tv_nsec);
        }
 #endif
 
        TRACE_DBG("Preferred context: %d (cmd %p)", pref_context, cmd);
-       TRACE(TRACE_SCSI, "tag=%llu, lun=%Ld, CDB len=%d",
+       TRACE(TRACE_SCSI, "tag=%llu, lun=%lld, CDB len=%d",
              (long long unsigned int)cmd->tag,
              (long long unsigned int)cmd->lun,
              cmd->cdb_len);
@@ -1087,7 +1087,7 @@ static void scst_do_cmd_done(struct scst_cmd *cmd, int result,
                struct timespec ts;
                getnstimeofday(&ts);
                cmd->post_exec_start = scst_sec_to_nsec(ts.tv_sec) + ts.tv_nsec;
-               TRACE_DBG("cmd %p (sess %p): post_exec_start %Ld (tv_sec %ld, "
+               TRACE_DBG("cmd %p (sess %p): post_exec_start %lld (tv_sec %ld, "
                        "tv_nsec %ld)", cmd, cmd->sess, cmd->post_exec_start, ts.tv_sec,
                        ts.tv_nsec);
        }
@@ -1227,7 +1227,7 @@ static void scst_cmd_done_local(struct scst_cmd *cmd, int next_state)
                struct timespec ts;
                getnstimeofday(&ts);
                cmd->post_exec_start = scst_sec_to_nsec(ts.tv_sec) + ts.tv_nsec;
-               TRACE_DBG("cmd %p (sess %p): post_exec_start %Ld (tv_sec %ld, "
+               TRACE_DBG("cmd %p (sess %p): post_exec_start %lld (tv_sec %ld, "
                        "tv_nsec %ld)", cmd, cmd->sess, cmd->post_exec_start, ts.tv_sec,
                        ts.tv_nsec);
        }
@@ -1437,7 +1437,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=%Ld)", (long long unsigned int)cmd->lun);
+                    "(lun=%lld)", (long long unsigned int)cmd->lun);
                scst_set_cmd_error(cmd,
                        SCST_LOAD_SENSE(scst_sense_invalid_field_in_cdb));
                goto out_done;
@@ -1768,7 +1768,7 @@ static int scst_do_send_to_midlev(struct scst_cmd *cmd)
 
        if (unlikely(dev->scsi_dev == NULL)) {
                PRINT_ERROR("Command for virtual device must be "
-                       "processed by device handler (lun %Ld)!",
+                       "processed by device handler (lun %lld)!",
                        (long long unsigned int)cmd->lun);
                goto out_error;
        }
@@ -1946,7 +1946,7 @@ static int scst_send_to_midlev(struct scst_cmd **active_cmd)
                struct timespec ts;
                getnstimeofday(&ts);
                cmd->pre_exec_finish = scst_sec_to_nsec(ts.tv_sec) + ts.tv_nsec;
-               TRACE_DBG("cmd %p (sess %p): pre_exec_finish %Ld (tv_sec %ld, "
+               TRACE_DBG("cmd %p (sess %p): pre_exec_finish %lld (tv_sec %ld, "
                        "tv_nsec %ld)", cmd, cmd->sess, cmd->pre_exec_finish,
                        ts.tv_sec, ts.tv_nsec);
        }
@@ -2253,7 +2253,7 @@ static int scst_done_cmd_check(struct scst_cmd **pcmd, int *pres)
 #ifdef CONFIG_SCST_EXTRACHECKS
                                if (buffer[SCST_INQ_BYTE3] & SCST_INQ_NORMACA_BIT) {
                                        PRINT_INFO("NormACA set for device: "
-                                           "lun=%Ld, type 0x%02x. Clear it, "
+                                           "lun=%lld, type 0x%02x. Clear it, "
                                            "since it's unsupported.",
                                            (long long unsigned int)cmd->lun,
                                            buffer[0]);
@@ -2274,7 +2274,7 @@ static int scst_done_cmd_check(struct scst_cmd **pcmd, int *pres)
                if (unlikely((cmd->cdb[0] == MODE_SELECT) ||
                    (cmd->cdb[0] == MODE_SELECT_10) ||
                    (cmd->cdb[0] == LOG_SELECT))) {
-                       TRACE(TRACE_SCSI, "MODE/LOG SELECT succeeded (LUN %Ld)",
+                       TRACE(TRACE_SCSI, "MODE/LOG SELECT succeeded (LUN %lld)",
                                (long long unsigned int)cmd->lun);
                        cmd->state = SCST_CMD_STATE_MODE_SELECT_CHECKS;
                        *pres = SCST_CMD_STATE_RES_CONT_SAME;
@@ -2288,7 +2288,7 @@ static int scst_done_cmd_check(struct scst_cmd **pcmd, int *pres)
                                struct scst_tgt_dev *tgt_dev_tmp;
                                struct scst_device *dev = cmd->dev;
 
-                               TRACE(TRACE_SCSI, "Real RESERVE failed lun=%Ld, "
+                               TRACE(TRACE_SCSI, "Real RESERVE failed lun=%lld, "
                                        "status=%x",
                                        (long long unsigned int)cmd->lun,
                                        cmd->status);
@@ -2314,7 +2314,7 @@ static int scst_done_cmd_check(struct scst_cmd **pcmd, int *pres)
                    scst_is_ua_sense(cmd->sense) &&
                    (cmd->sense[12] == 0x2a) && (cmd->sense[13] == 0x01)) {
                        TRACE(TRACE_SCSI,
-                             "MODE PARAMETERS CHANGED UA (lun %Ld)",
+                             "MODE PARAMETERS CHANGED UA (lun %lld)",
                              (long long unsigned int)cmd->lun);
                        cmd->state = SCST_CMD_STATE_MODE_SELECT_CHECKS;
                        *pres = SCST_CMD_STATE_RES_CONT_SAME;
@@ -2365,7 +2365,7 @@ static int scst_mode_select_checks(struct scst_cmd *cmd)
                        }
 
                        TRACE(TRACE_SCSI, "MODE/LOG SELECT succeeded, "
-                               "setting the SELECT UA (lun=%Ld)",
+                               "setting the SELECT UA (lun=%lld)",
                                (long long unsigned int)cmd->lun);
 
                        spin_lock_bh(&dev->dev_lock);
@@ -2402,7 +2402,7 @@ static int scst_mode_select_checks(struct scst_cmd *cmd)
                }
 
                TRACE(TRACE_SCSI, "Possible parameters changed UA %x "
-                       "(lun %Ld): getting new parameters", cmd->sense[12],
+                       "(lun %lld): getting new parameters", cmd->sense[12],
                        (long long unsigned int)cmd->lun);
 
                scst_obtain_device_parameters(cmd->dev);
@@ -2585,8 +2585,8 @@ out:
 
                spin_unlock_bh(&sess->meas_lock);
 
-               TRACE_DBG("cmd %p (sess %p): finish %Ld (tv_sec %ld, "
-                       "tv_nsec %ld), scst_time %Ld, proc_time %Ld", cmd, sess,
+               TRACE_DBG("cmd %p (sess %p): finish %lld (tv_sec %ld, "
+                       "tv_nsec %ld), scst_time %lld, proc_time %lld", cmd, sess,
                        finish, ts.tv_sec, ts.tv_nsec, scst_time, proc_time);
        }
 #endif
@@ -2873,7 +2873,7 @@ static int scst_translate_lun(struct scst_cmd *cmd)
        if (likely(!test_bit(SCST_FLAG_SUSPENDED, &scst_flags))) {
                struct list_head *sess_tgt_dev_list_head =
                        &cmd->sess->sess_tgt_dev_list_hash[HASH_VAL(cmd->lun)];
-               TRACE_DBG("Finding tgt_dev for cmd %p (lun %Ld)", cmd,
+               TRACE_DBG("Finding tgt_dev for cmd %p (lun %lld)", cmd,
                        (long long unsigned int)cmd->lun);
                res = -1;
                list_for_each_entry(tgt_dev, sess_tgt_dev_list_head,
@@ -2883,7 +2883,7 @@ static int scst_translate_lun(struct scst_cmd *cmd)
 
                                if (unlikely(tgt_dev->dev->handler == &scst_null_devtype)) {
                                        PRINT_INFO("Dev handler for device "
-                                         "%Ld is NULL, the device will not be "
+                                         "%lld is NULL, the device will not be "
                                          "visible remotely",
                                           (long long unsigned int)cmd->lun);
                                        break;
@@ -2898,7 +2898,7 @@ static int scst_translate_lun(struct scst_cmd *cmd)
                        }
                }
                if (res != 0) {
-                       TRACE(TRACE_MINOR, "tgt_dev for lun %Ld not found, command to "
+                       TRACE(TRACE_MINOR, "tgt_dev for lun %lld not found, command to "
                                "unexisting LU?", (long long unsigned int)cmd->lun);
                        __scst_put();
                }
@@ -3373,7 +3373,7 @@ static int scst_mgmt_translate_lun(struct scst_mgmt_cmd *mcmd)
 
        TRACE_ENTRY();
 
-       TRACE_DBG("Finding tgt_dev for mgmt cmd %p (lun %Ld)", mcmd,
+       TRACE_DBG("Finding tgt_dev for mgmt cmd %p (lun %lld)", mcmd,
              (long long unsigned int)mcmd->lun);
 
        __scst_get(1);
@@ -3845,7 +3845,7 @@ static int scst_abort_task_set(struct scst_mgmt_cmd *mcmd)
        struct scst_tgt_dev *tgt_dev = mcmd->mcmd_tgt_dev;
        struct scst_device *dev = tgt_dev->dev;
 
-       TRACE(TRACE_MGMT, "Aborting task set (lun=%Ld, mcmd=%p)",
+       TRACE(TRACE_MGMT, "Aborting task set (lun=%lld, mcmd=%p)",
              (long long unsigned int)tgt_dev->lun, mcmd);
 
        mcmd->needs_unblocking = 1;
@@ -3875,7 +3875,7 @@ static int scst_is_cmd_belongs_to_dev(struct scst_cmd *cmd,
 
        TRACE_ENTRY();
 
-       TRACE_DBG("Finding match for dev %p and cmd %p (lun %Ld)", dev, cmd,
+       TRACE_DBG("Finding match for dev %p and cmd %p (lun %lld)", dev, cmd,
              (long long unsigned int)cmd->lun);
 
        sess_tgt_dev_list_head =
@@ -3904,7 +3904,7 @@ static int scst_clear_task_set(struct scst_mgmt_cmd *mcmd)
 
        TRACE_ENTRY();
 
-       TRACE(TRACE_MGMT, "Clearing task set (lun=%Ld, mcmd=%p)",
+       TRACE(TRACE_MGMT, "Clearing task set (lun=%lld, mcmd=%p)",
                (long long unsigned int)mcmd->lun, mcmd);
 
        mcmd->needs_unblocking = 1;
@@ -4002,8 +4002,8 @@ static int scst_mgmt_cmd_init(struct scst_mgmt_cmd *mcmd)
                        cmd->sn, cmd->sn_set, cmd->queue_type);
                mcmd->cmd_to_abort = cmd;
                if (mcmd->lun_set && (mcmd->lun != cmd->lun)) {
-                       PRINT_ERROR("ABORT TASK: LUN mismatch: mcmd LUN %Lx, "
-                               "cmd LUN %Lx, cmd tag %Lu",
+                       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);
@@ -4012,7 +4012,7 @@ static int scst_mgmt_cmd_init(struct scst_mgmt_cmd *mcmd)
                           (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 %Lu", mcmd->cmd_sn,
+                               "cmd SN %x, cmd tag %llu", mcmd->cmd_sn,
                                cmd->tgt_sn, (long long unsigned int)mcmd->tag);
                        mcmd->status = SCST_MGMT_STATUS_REJECTED;
                } else {
@@ -4039,7 +4039,7 @@ static int scst_mgmt_cmd_init(struct scst_mgmt_cmd *mcmd)
        case SCST_LUN_RESET:
                rc = scst_mgmt_translate_lun(mcmd);
                if (rc < 0) {
-                       PRINT_ERROR("Corresponding device for lun %Ld not "
+                       PRINT_ERROR("Corresponding device for lun %lld not "
                                    "found",
                                    (long long unsigned int)mcmd->lun);
                        mcmd->status = SCST_MGMT_STATUS_LUN_NOT_EXIST;
@@ -4166,7 +4166,7 @@ static int scst_lun_reset(struct scst_mgmt_cmd *mcmd)
 
        TRACE_ENTRY();
 
-       TRACE(TRACE_MGMT, "Resetting lun %Ld (mcmd %p)",
+       TRACE(TRACE_MGMT, "Resetting lun %lld (mcmd %p)",
              (long long unsigned int)tgt_dev->lun, mcmd);
 
        mcmd->needs_unblocking = 1;
@@ -4830,8 +4830,8 @@ int scst_rx_mgmt_fn(struct scst_session *sess,
        TRACE((params->fn == SCST_ABORT_TASK) ? TRACE_MGMT_MINOR : TRACE_MGMT,
                "TM fn %x", params->fn);
 
-       TRACE_MGMT_DBG("sess=%p, tag_set %d, tag %Ld, lun_set %d, "
-               "lun=%Ld, cmd_sn_set %d, cmd_sn %d, priv %p", 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,
                params->lun_set,