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

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (200 commits)
  [SCSI] usbstorage: use last_sector_bug flag universally
  [SCSI] libsas: abstract STP task status into a function
  [SCSI] ultrastor: clean up inline asm warnings
  [SCSI] aic7xxx: fix firmware build
  [SCSI] aacraid: fib context lock for management ioctls
  [SCSI] ch: remove forward declarations
  [SCSI] ch: fix device minor number management bug
  [SCSI] ch: handle class_device_create failure properly
  [SCSI] NCR5380: fix section mismatch
  [SCSI] sg: fix /proc/scsi/sg/devices when no SCSI devices
  [SCSI] IB/iSER: add logical unit reset support
  [SCSI] don't use __GFP_DMA for sense buffers if not required
  [SCSI] use dynamically allocated sense buffer
  [SCSI] scsi.h: add macro for enclosure bit of inquiry data
  [SCSI] sd: add fix for devices with last sector access problems
  [SCSI] fix pcmcia compile problem
  [SCSI] aacraid: add Voodoo Lite class of cards.
  [SCSI] aacraid: add new driver features flags
  [SCSI] qla2xxx: Update version number to 8.02.00-k7.
  [SCSI] qla2xxx: Issue correct MBC_INITIALIZE_FIRMWARE command.
  ...

1 files changed, 16 insertions, 8 deletions

diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index f1871ea04045..17216b76efdc 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -602,8 +602,9 @@ sg_write(struct file *filp, const char __user *buf, size_t count, loff_t * ppos)
          * but is is possible that the app intended SG_DXFER_TO_DEV, because there
          * is a non-zero input_size, so emit a warning.
          */
-        if (hp->dxfer_direction == SG_DXFER_TO_FROM_DEV)
-                if (printk_ratelimit())
+        if (hp->dxfer_direction == SG_DXFER_TO_FROM_DEV) {
+                static char cmd[TASK_COMM_LEN];
+                if (strcmp(current->comm, cmd) && printk_ratelimit()) {
                         printk(KERN_WARNING
                                "sg_write: data in/out %d/%d bytes for SCSI command 0x%x--"
                                "guessing data in;\n" KERN_WARNING "   "
@@ -611,6 +612,9 @@ sg_write(struct file *filp, const char __user *buf, size_t count, loff_t * ppos)
                                old_hdr.reply_len - (int)SZ_SG_HEADER,
                                input_size, (unsigned int) cmnd[0],
                                current->comm);
+                        strcpy(cmd, current->comm);
+                }
+        }
         k = sg_common_write(sfp, srp, cmnd, sfp->timeout, blocking);
         return (k < 0) ? k : count;
 }
@@ -1418,7 +1422,6 @@ sg_add(struct class_device *cl_dev, struct class_interface *cl_intf)
                 goto out;
         }
 
-        class_set_devdata(cl_dev, sdp);
         error = cdev_add(cdev, MKDEV(SCSI_GENERIC_MAJOR, sdp->index), 1);
         if (error)
                 goto cdev_add_err;
@@ -1431,11 +1434,14 @@ sg_add(struct class_device *cl_dev, struct class_interface *cl_intf)
                                 MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
                                 cl_dev->dev, "%s",
                                 disk->disk_name);
-                if (IS_ERR(sg_class_member))
-                        printk(KERN_WARNING "sg_add: "
-                                "class_device_create failed\n");
+                if (IS_ERR(sg_class_member)) {
+                        printk(KERN_ERR "sg_add: "
+                               "class_device_create failed\n");
+                        error = PTR_ERR(sg_class_member);
+                        goto cdev_add_err;
+                }
                 class_set_devdata(sg_class_member, sdp);
-                error = sysfs_create_link(&scsidp->sdev_gendev.kobj, 
+                error = sysfs_create_link(&scsidp->sdev_gendev.kobj,
                                           &sg_class_member->kobj, "generic");
                 if (error)
                         printk(KERN_ERR "sg_add: unable to make symlink "
@@ -1447,6 +1453,8 @@ sg_add(struct class_device *cl_dev, struct class_interface *cl_intf)
                     "Attached scsi generic sg%d type %d\n", sdp->index,
                     scsidp->type);
 
+        class_set_devdata(cl_dev, sdp);
+
         return 0;
 
 cdev_add_err:
@@ -2521,7 +2529,7 @@ sg_idr_max_id(int id, void *p, void *data)
 static int
 sg_last_dev(void)
 {
-        int k = 0;
+        int k = -1;
         unsigned long iflags;
 
         read_lock_irqsave(&sg_index_lock, iflags);