Merge by Hand

Conflicts in dec_esp.c (Thanks Bacchus), scsi_transport_iscsi.c and
scsi_transport_fc.h

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

1 files changed, 7 insertions, 10 deletions

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 9a1dc0cea03c..9de8e186cb69 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -1253,14 +1253,13 @@ got_data:
                  * Jacques Gelinas (Jacques@solucorp.qc.ca)
                  */
                 int hard_sector = sector_size;
-                sector_t sz = sdkp->capacity * (hard_sector/256);
+                sector_t sz = (sdkp->capacity/2) * (hard_sector/256);
                 request_queue_t *queue = sdp->request_queue;
-                sector_t mb;
+                sector_t mb = sz;
 
                 blk_queue_hardsect_size(queue, hard_sector);
                 /* avoid 64-bit division on 32-bit platforms */
-                mb = sz >> 1;
-                sector_div(sz, 1250);
+                sector_div(sz, 625);
                 mb -= sz - 974;
                 sector_div(mb, 1950);
 
@@ -1535,8 +1534,8 @@ static int sd_probe(struct device *dev)
         if (sdp->type != TYPE_DISK && sdp->type != TYPE_MOD && sdp->type != TYPE_RBC)
                 goto out;
 
-        SCSI_LOG_HLQUEUE(3, printk("sd_attach: scsi device: <%d,%d,%d,%d>\n", 
-                         sdp->host->host_no, sdp->channel, sdp->id, sdp->lun));
+        SCSI_LOG_HLQUEUE(3, sdev_printk(KERN_INFO, sdp,
+                                        "sd_attach\n"));
 
         error = -ENOMEM;
         sdkp = kmalloc(sizeof(*sdkp), GFP_KERNEL);
@@ -1608,10 +1607,8 @@ static int sd_probe(struct device *dev)
         dev_set_drvdata(dev, sdkp);
         add_disk(gd);
 
-        printk(KERN_NOTICE "Attached scsi %sdisk %s at scsi%d, channel %d, "
-               "id %d, lun %d\n", sdp->removable ? "removable " : "",
-               gd->disk_name, sdp->host->host_no, sdp->channel,
-               sdp->id, sdp->lun);
+        sdev_printk(KERN_NOTICE, sdp, "Attached scsi %sdisk %s\n",
+                    sdp->removable ? "removable " : "", gd->disk_name);
 
         return 0;