Merge ../scsi-rc-fixes-2.6

Conflicts:

	include/scsi/scsi_devinfo.h

Same number for two BLIST flags:  BLIST_MAX_512 and BLIST_ATTACH_PQ3

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

4 files changed, 36 insertions, 14 deletions

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index d0cac8b58de7..59e1259b1c40 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -17,6 +17,8 @@
 
 #include <asm/scatterlist.h>
 
+struct scsi_ioctl_command;
+
 struct request_queue;
 typedef struct request_queue request_queue_t;
 struct elevator_queue;
@@ -611,6 +613,8 @@ extern void blk_plug_device(request_queue_t *);
 extern int blk_remove_plug(request_queue_t *);
 extern void blk_recount_segments(request_queue_t *, struct bio *);
 extern int scsi_cmd_ioctl(struct file *, struct gendisk *, unsigned int, void __user *);
+extern int sg_scsi_ioctl(struct file *, struct request_queue *,
+                struct gendisk *, struct scsi_ioctl_command __user *);
 extern void blk_start_queue(request_queue_t *q);
 extern void blk_stop_queue(request_queue_t *q);
 extern void blk_sync_queue(struct request_queue *q);
diff --git a/include/scsi/scsi_devinfo.h b/include/scsi/scsi_devinfo.h
index 599966898208..b4ddd3b18b4c 100644
--- a/include/scsi/scsi_devinfo.h
+++ b/include/scsi/scsi_devinfo.h
@@ -28,5 +28,6 @@
 #define BLIST_NO_ULD_ATTACH     0x100000 /* device is actually for RAID config */
 #define BLIST_SELECT_NO_ATN     0x200000 /* select without ATN */
 #define BLIST_RETRY_HWERROR     0x400000 /* retry HARDWARE_ERROR */
-#define BLIST_ATTACH_PQ3        0x800000 /* Scan: Attach to PQ3 devices */
+#define BLIST_MAX_512           0x800000 /* maximum 512 sector cdb length */
+#define BLIST_ATTACH_PQ3        0x1000000 /* Scan: Attach to PQ3 devices */
 #endif
diff --git a/include/scsi/scsi_ioctl.h b/include/scsi/scsi_ioctl.h
index d4be4d92d586..edb9525386da 100644
--- a/include/scsi/scsi_ioctl.h
+++ b/include/scsi/scsi_ioctl.h
@@ -41,8 +41,6 @@ typedef struct scsi_fctargaddress {
 } Scsi_FCTargAddress;
 
 extern int scsi_ioctl(struct scsi_device *, int, void __user *);
-extern int scsi_ioctl_send_command(struct scsi_device *,
-                                   struct scsi_ioctl_command __user *);
 extern int scsi_nonblockable_ioctl(struct scsi_device *sdev, int cmd,
                                    void __user *arg, struct file *filp);
 
diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
index cf3fec8be1e3..5626225bd3ae 100644
--- a/include/scsi/scsi_transport_fc.h
+++ b/include/scsi/scsi_transport_fc.h
@@ -202,12 +202,19 @@ struct fc_rport {	/* aka fc_starget_attrs */
         /* internal data */
         unsigned int channel;
         u32 number;
+        u8 flags;
         struct list_head peers;
         struct device dev;
         struct work_struct dev_loss_work;
         struct work_struct scan_work;
+        struct work_struct stgt_delete_work;
+        struct work_struct rport_delete_work;
 } __attribute__((aligned(sizeof(unsigned long))));
 
+/* bit field values for struct fc_rport "flags" field: */
+#define FC_RPORT_DEVLOSS_PENDING        0x01
+#define FC_RPORT_SCAN_PENDING           0x02
+
 #define dev_to_rport(d)                         \
         container_of(d, struct fc_rport, dev)
 #define transport_class_to_rport(classdev)      \
@@ -327,13 +334,16 @@ struct fc_host_attrs {
         struct list_head rport_bindings;
         u32 next_rport_number;
         u32 next_target_id;
-        u8 flags;
-        struct work_struct rport_del_work;
-};
 
-/* values for struct fc_host_attrs "flags" field: */
-#define FC_SHOST_RPORT_DEL_SCHEDULED    0x01
+        /* work queues for rport state manipulation */
+        char work_q_name[KOBJ_NAME_LEN];
+        struct workqueue_struct *work_q;
+        char devloss_work_q_name[KOBJ_NAME_LEN];
+        struct workqueue_struct *devloss_work_q;
+};
 
+#define shost_to_fc_host(x) \
+        ((struct fc_host_attrs *)(x)->shost_data)
 
 #define fc_host_node_name(x) \
         (((struct fc_host_attrs *)(x)->shost_data)->node_name)
@@ -375,10 +385,14 @@ struct fc_host_attrs {
         (((struct fc_host_attrs *)(x)->shost_data)->next_rport_number)
 #define fc_host_next_target_id(x) \
         (((struct fc_host_attrs *)(x)->shost_data)->next_target_id)
-#define fc_host_flags(x) \
-        (((struct fc_host_attrs *)(x)->shost_data)->flags)
-#define fc_host_rport_del_work(x) \
-        (((struct fc_host_attrs *)(x)->shost_data)->rport_del_work)
+#define fc_host_work_q_name(x) \
+        (((struct fc_host_attrs *)(x)->shost_data)->work_q_name)
+#define fc_host_work_q(x) \
+        (((struct fc_host_attrs *)(x)->shost_data)->work_q)
+#define fc_host_devloss_work_q_name(x) \
+        (((struct fc_host_attrs *)(x)->shost_data)->devloss_work_q_name)
+#define fc_host_devloss_work_q(x) \
+        (((struct fc_host_attrs *)(x)->shost_data)->devloss_work_q)
 
 
 /* The functions by which the transport class and the driver communicate */
@@ -461,10 +475,15 @@ fc_remote_port_chkready(struct fc_rport *rport)
 
         switch (rport->port_state) {
         case FC_PORTSTATE_ONLINE:
-                result = 0;
+                if (rport->roles & FC_RPORT_ROLE_FCP_TARGET)
+                        result = 0;
+                else if (rport->flags & FC_RPORT_DEVLOSS_PENDING)
+                        result = DID_IMM_RETRY << 16;
+                else
+                        result = DID_NO_CONNECT << 16;
                 break;
         case FC_PORTSTATE_BLOCKED:
-                result = DID_BUS_BUSY << 16;
+                result = DID_IMM_RETRY << 16;
                 break;
         default:
                 result = DID_NO_CONNECT << 16;