Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (207 commits)
  [SCSI] gdth: fix CONFIG_ISA build failure
  [SCSI] esp_scsi: remove __dev{init,exit}
  [SCSI] gdth: !use_sg cleanup and use of scsi accessors
  [SCSI] gdth: Move members from SCp to gdth_cmndinfo, stage 2
  [SCSI] gdth: Setup proper per-command private data
  [SCSI] gdth: Remove gdth_ctr_tab[]
  [SCSI] gdth: switch to modern scsi host registration
  [SCSI] gdth: gdth_interrupt() gdth_get_status() & gdth_wait() fixes
  [SCSI] gdth: clean up host private data
  [SCSI] gdth: Remove virt hosts
  [SCSI] gdth: Reorder scsi_host_template intitializers
  [SCSI] gdth: kill gdth_{read,write}[bwl] wrappers
  [SCSI] gdth: Remove 2.4.x support, in-kernel changelog
  [SCSI] gdth: split out pci probing
  [SCSI] gdth: split out eisa probing
  [SCSI] gdth: split out isa probing
  gdth: Make one abuse of scsi_cmnd less obvious
  [SCSI] NCR5380: Use scsi_eh API for REQUEST_SENSE invocation
  [SCSI] usb storage: use scsi_eh API in REQUEST_SENSE execution
  [SCSI] scsi_error: Refactoring scsi_error to facilitate in synchronous REQUEST_SENSE
  ...

1 files changed, 10 insertions, 11 deletions

diff --git a/drivers/scsi/osst.c b/drivers/scsi/osst.c
index 08060fb478b6..331b789937c4 100644
--- a/drivers/scsi/osst.c
+++ b/drivers/scsi/osst.c
@@ -3298,7 +3298,7 @@ static ssize_t osst_write(struct file * filp, const char __user * buf, size_t co
         char                * name = tape_name(STp);
 
 
-        if (down_interruptible(&STp->lock))
+        if (mutex_lock_interruptible(&STp->lock))
                 return (-ERESTARTSYS);
 
         /*
@@ -3600,7 +3600,7 @@ if (SRpnt) printk(KERN_ERR "%s:A: Not supposed to have SRpnt at line %d\n", name
 out:
         if (SRpnt != NULL) osst_release_request(SRpnt);
 
-        up(&STp->lock);
+        mutex_unlock(&STp->lock);
 
         return retval;
 }
@@ -3619,7 +3619,7 @@ static ssize_t osst_read(struct file * filp, char __user * buf, size_t count, lo
         char                * name  = tape_name(STp);
 
 
-        if (down_interruptible(&STp->lock))
+        if (mutex_lock_interruptible(&STp->lock))
                 return (-ERESTARTSYS);
 
         /*
@@ -3785,7 +3785,7 @@ static ssize_t osst_read(struct file * filp, char __user * buf, size_t count, lo
 out:
         if (SRpnt != NULL) osst_release_request(SRpnt);
 
-        up(&STp->lock);
+        mutex_unlock(&STp->lock);
 
         return retval;
 }
@@ -4852,7 +4852,7 @@ static int osst_ioctl(struct inode * inode,struct file * file,
         char                * name  = tape_name(STp);
         void        __user  * p     = (void __user *)arg;
 
-        if (down_interruptible(&STp->lock))
+        if (mutex_lock_interruptible(&STp->lock))
                 return -ERESTARTSYS;
 
 #if DEBUG
@@ -5163,14 +5163,14 @@ static int osst_ioctl(struct inode * inode,struct file * file,
         }
         if (SRpnt) osst_release_request(SRpnt);
 
-        up(&STp->lock);
+        mutex_unlock(&STp->lock);
 
         return scsi_ioctl(STp->device, cmd_in, p);
 
 out:
         if (SRpnt) osst_release_request(SRpnt);
 
-        up(&STp->lock);
+        mutex_unlock(&STp->lock);
 
         return retval;
 }
@@ -5778,13 +5778,12 @@ static int osst_probe(struct device *dev)
         dev_num = i;
 
         /* allocate a struct osst_tape for this device */
-        tpnt = kmalloc(sizeof(struct osst_tape), GFP_ATOMIC);
-        if (tpnt == NULL) {
+        tpnt = kzalloc(sizeof(struct osst_tape), GFP_ATOMIC);
+        if (!tpnt) {
                 write_unlock(&os_scsi_tapes_lock);
                 printk(KERN_ERR "osst :E: Can't allocate device descriptor, device not attached.\n");
                 goto out_put_disk;
         }
-        memset(tpnt, 0, sizeof(struct osst_tape));
 
         /* allocate a buffer for this device */
         i = SDp->host->sg_tablesize;
@@ -5866,7 +5865,7 @@ static int osst_probe(struct device *dev)
         tpnt->modes[2].defined = 1;
         tpnt->density_changed = tpnt->compression_changed = tpnt->blksize_changed = 0;
 
-        init_MUTEX(&tpnt->lock);
+        mutex_init(&tpnt->lock);
         osst_nr_dev++;
         write_unlock(&os_scsi_tapes_lock);