Merge http://sucs.org/~rohan/git/gfs2-3.0-nmw

[~andy/linux] / drivers / target / target_core_cdb.c

diff --git a/drivers/target/target_core_cdb.c b/drivers/target/target_core_cdb.c
index f04d4ef99dca00893761a3fe7c3b93c9dd6ba519..38535eb13929ba5242e128629abfeadae409fc7a 100644 (file)
--- a/drivers/target/target_core_cdb.c
+++ b/drivers/target/target_core_cdb.c
@@ -24,7 +24,7 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/ctype.h>
+#include <linux/module.h>
 #include <asm/unaligned.h>
 #include <scsi/scsi.h>
 
@@ -156,11 +156,12 @@ target_emulate_evpd_80(struct se_cmd *cmd, unsigned char *buf)
 }
 
 static void
-target_parse_naa_6h_vendor_specific(struct se_device *dev, unsigned char *buf_off)
+target_parse_naa_6h_vendor_specific(struct se_device *dev, unsigned char *buf)
 {
        unsigned char *p = &dev->se_sub_dev->t10_wwn.unit_serial[0];
-       unsigned char *buf = buf_off;
-       int cnt = 0, next = 1;
+       int cnt;
+       bool next = true;
+
        /*
         * Generate up to 36 bits of VENDOR SPECIFIC IDENTIFIER starting on
         * byte 3 bit 3-0 for NAA IEEE Registered Extended DESIGNATOR field
@@ -169,19 +170,18 @@ target_parse_naa_6h_vendor_specific(struct se_device *dev, unsigned char *buf_of
         * NUMBER set via vpd_unit_serial in target_core_configfs.c to ensure
         * per device uniqeness.
         */
-       while (*p != '\0') {
-               if (cnt >= 13)
-                       break;
-               if (!isxdigit(*p)) {
-                       p++;
+       for (cnt = 0; *p && cnt < 13; p++) {
+               int val = hex_to_bin(*p);
+
+               if (val < 0)
                        continue;
-               }
-               if (next != 0) {
-                       buf[cnt++] |= hex_to_bin(*p++);
-                       next = 0;
+
+               if (next) {
+                       next = false;
+                       buf[cnt++] |= val;
                } else {
-                       buf[cnt] = hex_to_bin(*p++) << 4;
-                       next = 1;
+                       next = true;
+                       buf[cnt] = val << 4;
                }
        }
 }
@@ -1266,3 +1266,52 @@ transport_emulate_control_cdb(struct se_task *task)
 
        return PYX_TRANSPORT_SENT_TO_TRANSPORT;
 }
+
+/*
+ * Write a CDB into @cdb that is based on the one the intiator sent us,
+ * but updated to only cover the sectors that the current task handles.
+ */
+void target_get_task_cdb(struct se_task *task, unsigned char *cdb)
+{
+       struct se_cmd *cmd = task->task_se_cmd;
+       unsigned int cdb_len = scsi_command_size(cmd->t_task_cdb);
+
+       memcpy(cdb, cmd->t_task_cdb, cdb_len);
+       if (cmd->se_cmd_flags & SCF_SCSI_DATA_SG_IO_CDB) {
+               unsigned long long lba = task->task_lba;
+               u32 sectors = task->task_sectors;
+
+               switch (cdb_len) {
+               case 6:
+                       /* 21-bit LBA and 8-bit sectors */
+                       cdb[1] = (lba >> 16) & 0x1f;
+                       cdb[2] = (lba >> 8) & 0xff;
+                       cdb[3] = lba & 0xff;
+                       cdb[4] = sectors & 0xff;
+                       break;
+               case 10:
+                       /* 32-bit LBA and 16-bit sectors */
+                       put_unaligned_be32(lba, &cdb[2]);
+                       put_unaligned_be16(sectors, &cdb[7]);
+                       break;
+               case 12:
+                       /* 32-bit LBA and 32-bit sectors */
+                       put_unaligned_be32(lba, &cdb[2]);
+                       put_unaligned_be32(sectors, &cdb[6]);
+                       break;
+               case 16:
+                       /* 64-bit LBA and 32-bit sectors */
+                       put_unaligned_be64(lba, &cdb[2]);
+                       put_unaligned_be32(sectors, &cdb[10]);
+                       break;
+               case 32:
+                       /* 64-bit LBA and 32-bit sectors, extended CDB */
+                       put_unaligned_be64(lba, &cdb[12]);
+                       put_unaligned_be32(sectors, &cdb[28]);
+                       break;
+               default:
+                       BUG();
+               }
+       }
+}
+EXPORT_SYMBOL(target_get_task_cdb);