1 files changed, 70 insertions, 28 deletions

diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 73902d335767..0009818a4306 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -149,6 +149,45 @@ int ata_std_bios_param(struct scsi_device *sdev, struct block_device *bdev,
 }
 
 /**
+ *      ata_get_identity - Handler for HDIO_GET_IDENTITY ioctl
+ *      @sdev: SCSI device to get identify data for
+ *      @arg: User buffer area for identify data
+ *
+ *      LOCKING:
+ *      Defined by the SCSI layer.  We don't really care.
+ *
+ *      RETURNS:
+ *      Zero on success, negative errno on error.
+ */
+static int ata_get_identity(struct scsi_device *sdev, void __user *arg)
+{
+        struct ata_port *ap = ata_shost_to_port(sdev->host);
+        struct ata_device *dev = ata_scsi_find_dev(ap, sdev);
+        u16 __user *dst = arg;
+        char buf[40];
+
+        if (!dev)
+                return -ENOMSG;
+
+        if (copy_to_user(dst, dev->id, ATA_ID_WORDS * sizeof(u16)))
+                return -EFAULT;
+
+        ata_id_string(dev->id, buf, ATA_ID_PROD, ATA_ID_PROD_LEN);
+        if (copy_to_user(dst + ATA_ID_PROD, buf, ATA_ID_PROD_LEN))
+                return -EFAULT;
+
+        ata_id_string(dev->id, buf, ATA_ID_FW_REV, ATA_ID_FW_REV_LEN);
+        if (copy_to_user(dst + ATA_ID_FW_REV, buf, ATA_ID_FW_REV_LEN))
+                return -EFAULT;
+
+        ata_id_string(dev->id, buf, ATA_ID_SERNO, ATA_ID_SERNO_LEN);
+        if (copy_to_user(dst + ATA_ID_SERNO, buf, ATA_ID_SERNO_LEN))
+                return -EFAULT;
+
+        return 0;
+}
+
+/**
  *      ata_cmd_ioctl - Handler for HDIO_DRIVE_CMD ioctl
  *      @scsidev: Device to which we are issuing command
  *      @arg: User provided data for issuing command
@@ -159,7 +198,6 @@ int ata_std_bios_param(struct scsi_device *sdev, struct block_device *bdev,
  *      RETURNS:
  *      Zero on success, negative errno on error.
  */
-
 int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg)
 {
         int rc = 0;
@@ -359,6 +397,9 @@ int ata_scsi_ioctl(struct scsi_device *scsidev, int cmd, void __user *arg)
                         return -EINVAL;
                 return 0;
 
+        case HDIO_GET_IDENTITY:
+                return ata_get_identity(scsidev, arg);
+
         case HDIO_DRIVE_CMD:
                 if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SYS_RAWIO))
                         return -EACCES;
@@ -397,9 +438,9 @@ int ata_scsi_ioctl(struct scsi_device *scsidev, int cmd, void __user *arg)
  *      RETURNS:
  *      Command allocated, or %NULL if none available.
  */
-struct ata_queued_cmd *ata_scsi_qc_new(struct ata_device *dev,
-                                       struct scsi_cmnd *cmd,
-                                       void (*done)(struct scsi_cmnd *))
+static struct ata_queued_cmd *ata_scsi_qc_new(struct ata_device *dev,
+                                              struct scsi_cmnd *cmd,
+                                              void (*done)(struct scsi_cmnd *))
 {
         struct ata_queued_cmd *qc;
 
@@ -435,7 +476,7 @@ struct ata_queued_cmd *ata_scsi_qc_new(struct ata_device *dev,
  *      LOCKING:
  *      inherited from caller
  */
-void ata_dump_status(unsigned id, struct ata_taskfile *tf)
+static void ata_dump_status(unsigned id, struct ata_taskfile *tf)
 {
         u8 stat = tf->command, err = tf->feature;
 
@@ -610,8 +651,8 @@ int ata_scsi_device_resume(struct scsi_device *sdev)
  *      LOCKING:
  *      spin_lock_irqsave(host lock)
  */
-void ata_to_sense_error(unsigned id, u8 drv_stat, u8 drv_err, u8 *sk, u8 *asc,
-                        u8 *ascq, int verbose)
+static void ata_to_sense_error(unsigned id, u8 drv_stat, u8 drv_err, u8 *sk,
+                               u8 *asc, u8 *ascq, int verbose)
 {
         int i;
 
@@ -1359,7 +1400,7 @@ static unsigned int ata_scsi_rw_xlat(struct ata_queued_cmd *qc)
                 goto nothing_to_do;
 
         qc->flags |= ATA_QCFLAG_IO;
-        qc->nsect = n_block;
+        qc->nbytes = n_block * ATA_SECT_SIZE;
 
         rc = ata_build_rw_tf(&qc->tf, qc->dev, block, n_block, tf_flags,
                              qc->tag);
@@ -1698,8 +1739,8 @@ unsigned int ata_scsiop_inq_std(struct ata_scsi_args *args, u8 *rbuf,
 
         if (buflen > 35) {
                 memcpy(&rbuf[8], "ATA     ", 8);
-                ata_id_string(args->id, &rbuf[16], ATA_ID_PROD_OFS, 16);
-                ata_id_string(args->id, &rbuf[32], ATA_ID_FW_REV_OFS, 4);
+                ata_id_string(args->id, &rbuf[16], ATA_ID_PROD, 16);
+                ata_id_string(args->id, &rbuf[32], ATA_ID_FW_REV, 4);
                 if (rbuf[32] == 0 || rbuf[32] == ' ')
                         memcpy(&rbuf[32], "n/a ", 4);
         }
@@ -1768,13 +1809,13 @@ unsigned int ata_scsiop_inq_80(struct ata_scsi_args *args, u8 *rbuf,
                 0,
                 0x80,                   /* this page code */
                 0,
-                ATA_SERNO_LEN,          /* page len */
+                ATA_ID_SERNO_LEN,       /* page len */
         };
         memcpy(rbuf, hdr, sizeof(hdr));
 
-        if (buflen > (ATA_SERNO_LEN + 4 - 1))
+        if (buflen > (ATA_ID_SERNO_LEN + 4 - 1))
                 ata_id_string(args->id, (unsigned char *) &rbuf[4],
-                              ATA_ID_SERNO_OFS, ATA_SERNO_LEN);
+                              ATA_ID_SERNO, ATA_ID_SERNO_LEN);
 
         return 0;
 }
@@ -1799,19 +1840,18 @@ unsigned int ata_scsiop_inq_83(struct ata_scsi_args *args, u8 *rbuf,
 {
         int num;
         const int sat_model_serial_desc_len = 68;
-        const int ata_model_byte_len = 40;
 
         rbuf[1] = 0x83;                 /* this page code */
         num = 4;
 
-        if (buflen > (ATA_SERNO_LEN + num + 3)) {
+        if (buflen > (ATA_ID_SERNO_LEN + num + 3)) {
                 /* piv=0, assoc=lu, code_set=ACSII, designator=vendor */
                 rbuf[num + 0] = 2;
-                rbuf[num + 3] = ATA_SERNO_LEN;
+                rbuf[num + 3] = ATA_ID_SERNO_LEN;
                 num += 4;
                 ata_id_string(args->id, (unsigned char *) rbuf + num,
-                              ATA_ID_SERNO_OFS, ATA_SERNO_LEN);
-                num += ATA_SERNO_LEN;
+                              ATA_ID_SERNO, ATA_ID_SERNO_LEN);
+                num += ATA_ID_SERNO_LEN;
         }
         if (buflen > (sat_model_serial_desc_len + num + 3)) {
                 /* SAT defined lu model and serial numbers descriptor */
@@ -1823,11 +1863,11 @@ unsigned int ata_scsiop_inq_83(struct ata_scsi_args *args, u8 *rbuf,
                 memcpy(rbuf + num, "ATA     ", 8);
                 num += 8;
                 ata_id_string(args->id, (unsigned char *) rbuf + num,
-                              ATA_ID_PROD_OFS, ata_model_byte_len);
-                num += ata_model_byte_len;
+                              ATA_ID_PROD, ATA_ID_PROD_LEN);
+                num += ATA_ID_PROD_LEN;
                 ata_id_string(args->id, (unsigned char *) rbuf + num,
-                              ATA_ID_SERNO_OFS, ATA_SERNO_LEN);
-                num += ATA_SERNO_LEN;
+                              ATA_ID_SERNO, ATA_ID_SERNO_LEN);
+                num += ATA_ID_SERNO_LEN;
         }
         rbuf[3] = num - 4;    /* page len (assume less than 256 bytes) */
         return 0;
@@ -1955,15 +1995,15 @@ static unsigned int ata_msense_rw_recovery(u8 **ptr_io, const u8 *last)
  */
 static int ata_dev_supports_fua(u16 *id)
 {
-        unsigned char model[41], fw[9];
+        unsigned char model[ATA_ID_PROD_LEN + 1], fw[ATA_ID_FW_REV_LEN + 1];
 
         if (!libata_fua)
                 return 0;
         if (!ata_id_has_fua(id))
                 return 0;
 
-        ata_id_c_string(id, model, ATA_ID_PROD_OFS, sizeof(model));
-        ata_id_c_string(id, fw, ATA_ID_FW_REV_OFS, sizeof(fw));
+        ata_id_c_string(id, model, ATA_ID_PROD, sizeof(model));
+        ata_id_c_string(id, fw, ATA_ID_FW_REV, sizeof(fw));
 
         if (strcmp(model, "Maxtor"))
                 return 1;
@@ -2661,7 +2701,7 @@ static unsigned int ata_scsi_pass_thru(struct ata_queued_cmd *qc)
          * TODO: find out if we need to do more here to
          *       cover scatter/gather case.
          */
-        qc->nsect = scmd->request_bufflen / ATA_SECT_SIZE;
+        qc->nbytes = scmd->request_bufflen;
 
         /* request result TF */
         qc->flags |= ATA_QCFLAG_RESULT_TF;
@@ -3059,7 +3099,8 @@ void ata_scsi_hotplug(struct work_struct *work)
         for (i = 0; i < ATA_MAX_DEVICES; i++) {
                 struct ata_device *dev = &ap->device[i];
                 if (ata_dev_enabled(dev) && !dev->sdev) {
-                        queue_delayed_work(ata_aux_wq, &ap->hotplug_task, HZ);
+                        queue_delayed_work(ata_aux_wq, &ap->hotplug_task,
+                                round_jiffies_relative(HZ));
                         break;
                 }
         }
@@ -3264,7 +3305,8 @@ EXPORT_SYMBOL_GPL(ata_sas_port_init);
 
 void ata_sas_port_destroy(struct ata_port *ap)
 {
-        ap->ops->port_stop(ap);
+        if (ap->ops->port_stop)
+                ap->ops->port_stop(ap);
         kfree(ap);
 }
 EXPORT_SYMBOL_GPL(ata_sas_port_destroy);