mirror of
https://github.com/SCST-project/scst.git
synced 2026-05-22 05:01:27 +00:00
lun_t changed to 64 bits. Don't know why it was 32 bits
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@146 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
@@ -361,7 +361,7 @@ struct scst_acg;
|
||||
struct scst_acg_dev;
|
||||
struct scst_acn;
|
||||
|
||||
typedef uint32_t lun_t;
|
||||
typedef uint64_t lun_t;
|
||||
|
||||
typedef enum dma_data_direction scst_data_direction;
|
||||
|
||||
@@ -1036,6 +1036,9 @@ struct scst_cmd
|
||||
|
||||
struct scst_tgt_dev *tgt_dev; /* corresponding device for this cmd */
|
||||
|
||||
/* The corresponding mgmt cmd, if any, protected by sess_list_lock */
|
||||
struct scst_mgmt_cmd *mgmt_cmnd;
|
||||
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
|
||||
struct scsi_request *scsi_req; /* SCSI request */
|
||||
#endif
|
||||
@@ -1113,6 +1116,9 @@ struct scst_cmd
|
||||
/* Used for storage of target driver private stuff */
|
||||
void *tgt_priv;
|
||||
|
||||
/* Used for storage of dev handler private stuff */
|
||||
void *dh_priv;
|
||||
|
||||
/*
|
||||
* Used to restore the SG vector if it was modified by
|
||||
* scst_set_resp_data_len()
|
||||
@@ -1121,15 +1127,9 @@ struct scst_cmd
|
||||
|
||||
uint8_t sense_buffer[SCST_SENSE_BUFFERSIZE]; /* sense buffer */
|
||||
|
||||
/* The corresponding mgmt cmd, if any, protected by sess_list_lock */
|
||||
struct scst_mgmt_cmd *mgmt_cmnd;
|
||||
|
||||
/* List entry for dev's blocked_cmd_list */
|
||||
struct list_head blocked_cmd_list_entry;
|
||||
|
||||
/* Used for storage of dev handler private stuff */
|
||||
void *dh_priv;
|
||||
|
||||
struct scst_cmd *orig_cmd; /* Used to issue REQUEST SENSE */
|
||||
};
|
||||
|
||||
|
||||
@@ -67,7 +67,7 @@
|
||||
#endif
|
||||
|
||||
#ifndef WARN_ON_ONCE
|
||||
#define WARN_ON_ONCE(condition) ({ \
|
||||
#define WARN_ON_ONCE(condition) ({ \
|
||||
static int __warned; \
|
||||
typeof(condition) __ret_warn_once = (condition); \
|
||||
\
|
||||
|
||||
@@ -1874,7 +1874,7 @@ int scst_cdrom_generic_parse(struct scst_cmd *cmd,
|
||||
* based on info_cdb, therefore change them only if necessary
|
||||
*/
|
||||
|
||||
TRACE_DBG("op_name <%s> direct %d flags %d transfer_len %d lun %d(%d)",
|
||||
TRACE_DBG("op_name <%s> direct %d flags %d transfer_len %d lun %Ld(%d)",
|
||||
info_cdb->op_name,
|
||||
info_cdb->direction,
|
||||
info_cdb->flags,
|
||||
@@ -1935,7 +1935,7 @@ int scst_modisk_generic_parse(struct scst_cmd *cmd,
|
||||
* based on info_cdb, therefore change them only if necessary
|
||||
*/
|
||||
|
||||
TRACE_DBG("op_name <%s> direct %d flags %d transfer_len %d lun %d(%d)",
|
||||
TRACE_DBG("op_name <%s> direct %d flags %d transfer_len %d lun %Ld(%d)",
|
||||
info_cdb->op_name,
|
||||
info_cdb->direction,
|
||||
info_cdb->flags,
|
||||
@@ -2208,7 +2208,7 @@ void scst_process_reset(struct scst_device *dev,
|
||||
dev_tgt_dev_list_entry)
|
||||
{
|
||||
TRACE(TRACE_MGMT, "Clearing RESERVE'ation for tgt_dev "
|
||||
"lun %d", tgt_dev->lun);
|
||||
"lun %Ld", tgt_dev->lun);
|
||||
clear_bit(SCST_TGT_DEV_RESERVED,
|
||||
&tgt_dev->tgt_dev_flags);
|
||||
}
|
||||
@@ -2416,7 +2416,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 %d",
|
||||
TRACE_MGMT_DBG("Clearing UA for tgt_dev lun %Ld",
|
||||
tgt_dev->lun);
|
||||
list_del(&UA_entry->UA_list_entry);
|
||||
kfree(UA_entry);
|
||||
|
||||
@@ -1826,7 +1826,7 @@ static int scst_groups_devices_show(struct seq_file *seq, void *v)
|
||||
acg_dev->lun,
|
||||
acg_dev->rd_only_flag ? "RO" : "");
|
||||
} else {
|
||||
seq_printf(seq, "%-60s%4d%12s\n",
|
||||
seq_printf(seq, "%-60s%4Ld%12s\n",
|
||||
acg_dev->dev->virt_name, acg_dev->lun,
|
||||
acg_dev->rd_only_flag ? "RO" : "");
|
||||
}
|
||||
|
||||
@@ -3307,7 +3307,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=%d, mcmd=%p)",
|
||||
TRACE(TRACE_MGMT, "Aborting task set (lun=%Ld, mcmd=%p)",
|
||||
tgt_dev->lun, mcmd);
|
||||
|
||||
spin_lock_bh(&dev->dev_lock);
|
||||
@@ -3493,7 +3493,7 @@ static int scst_lun_reset(struct scst_mgmt_cmd *mcmd)
|
||||
|
||||
TRACE_ENTRY();
|
||||
|
||||
TRACE(TRACE_MGMT, "Resetting lun %d (mcmd %p)", tgt_dev->lun, mcmd);
|
||||
TRACE(TRACE_MGMT, "Resetting lun %Ld (mcmd %p)", tgt_dev->lun, mcmd);
|
||||
|
||||
spin_lock_bh(&dev->dev_lock);
|
||||
__scst_block_dev(dev);
|
||||
|
||||
Reference in New Issue
Block a user