8 files changed, 53 insertions, 35 deletions

diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c
index e086fbbbe853..8db9089127c5 100644
--- a/drivers/block/DAC960.c
+++ b/drivers/block/DAC960.c
@@ -1177,7 +1177,8 @@ static bool DAC960_V1_EnableMemoryMailboxInterface(DAC960_Controller_T
   int TimeoutCounter;
   int i;
 
-  
+  memset(&CommandMailbox, 0, sizeof(DAC960_V1_CommandMailbox_T));
+
   if (pci_set_dma_mask(Controller->PCIDevice, DMA_BIT_MASK(32)))
         return DAC960_Failure(Controller, "DMA mask out of range");
   Controller->BounceBufferLimit = DMA_BIT_MASK(32);
@@ -4627,7 +4628,8 @@ static void DAC960_V2_ProcessCompletedCommand(DAC960_Command_T *Command)
   DAC960_Controller_T *Controller = Command->Controller;
   DAC960_CommandType_T CommandType = Command->CommandType;
   DAC960_V2_CommandMailbox_T *CommandMailbox = &Command->V2.CommandMailbox;
-  DAC960_V2_IOCTL_Opcode_T CommandOpcode = CommandMailbox->Common.IOCTL_Opcode;
+  DAC960_V2_IOCTL_Opcode_T IOCTLOpcode = CommandMailbox->Common.IOCTL_Opcode;
+  DAC960_V2_CommandOpcode_T CommandOpcode = CommandMailbox->SCSI_10.CommandOpcode;
   DAC960_V2_CommandStatus_T CommandStatus = Command->V2.CommandStatus;
 
   if (CommandType == DAC960_ReadCommand ||
@@ -4699,7 +4701,7 @@ static void DAC960_V2_ProcessCompletedCommand(DAC960_Command_T *Command)
     {
       if (Controller->ShutdownMonitoringTimer)
               return;
-      if (CommandOpcode == DAC960_V2_GetControllerInfo)
+      if (IOCTLOpcode == DAC960_V2_GetControllerInfo)
         {
           DAC960_V2_ControllerInfo_T *NewControllerInfo =
             Controller->V2.NewControllerInformation;
@@ -4719,14 +4721,14 @@ static void DAC960_V2_ProcessCompletedCommand(DAC960_Command_T *Command)
           memcpy(ControllerInfo, NewControllerInfo,
                  sizeof(DAC960_V2_ControllerInfo_T));
         }
-      else if (CommandOpcode == DAC960_V2_GetEvent)
+      else if (IOCTLOpcode == DAC960_V2_GetEvent)
         {
           if (CommandStatus == DAC960_V2_NormalCompletion) {
             DAC960_V2_ReportEvent(Controller, Controller->V2.Event);
           }
           Controller->V2.NextEventSequenceNumber++;
         }
-      else if (CommandOpcode == DAC960_V2_GetPhysicalDeviceInfoValid &&
+      else if (IOCTLOpcode == DAC960_V2_GetPhysicalDeviceInfoValid &&
                CommandStatus == DAC960_V2_NormalCompletion)
         {
           DAC960_V2_PhysicalDeviceInfo_T *NewPhysicalDeviceInfo =
@@ -4915,7 +4917,7 @@ static void DAC960_V2_ProcessCompletedCommand(DAC960_Command_T *Command)
           NewPhysicalDeviceInfo->LogicalUnit++;
           Controller->V2.PhysicalDeviceIndex++;
         }
-      else if (CommandOpcode == DAC960_V2_GetPhysicalDeviceInfoValid)
+      else if (IOCTLOpcode == DAC960_V2_GetPhysicalDeviceInfoValid)
         {
           unsigned int DeviceIndex;
           for (DeviceIndex = Controller->V2.PhysicalDeviceIndex;
@@ -4938,7 +4940,7 @@ static void DAC960_V2_ProcessCompletedCommand(DAC960_Command_T *Command)
             }
           Controller->V2.NeedPhysicalDeviceInformation = false;
         }
-      else if (CommandOpcode == DAC960_V2_GetLogicalDeviceInfoValid &&
+      else if (IOCTLOpcode == DAC960_V2_GetLogicalDeviceInfoValid &&
                CommandStatus == DAC960_V2_NormalCompletion)
         {
           DAC960_V2_LogicalDeviceInfo_T *NewLogicalDeviceInfo =
@@ -5065,7 +5067,7 @@ static void DAC960_V2_ProcessCompletedCommand(DAC960_Command_T *Command)
                          [LogicalDeviceNumber] = true;
           NewLogicalDeviceInfo->LogicalDeviceNumber++;
         }
-      else if (CommandOpcode == DAC960_V2_GetLogicalDeviceInfoValid)
+      else if (IOCTLOpcode == DAC960_V2_GetLogicalDeviceInfoValid)
         {
           int LogicalDriveNumber;
           for (LogicalDriveNumber = 0;
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 510fb10ec45a..744f078f4dd8 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -3832,7 +3832,7 @@ static int __floppy_read_block_0(struct block_device *bdev)
         bio.bi_size = size;
         bio.bi_bdev = bdev;
         bio.bi_sector = 0;
-        bio.bi_flags = BIO_QUIET;
+        bio.bi_flags = (1 << BIO_QUIET);
         init_completion(&complete);
         bio.bi_private = &complete;
         bio.bi_end_io = floppy_rb0_complete;
@@ -4368,8 +4368,14 @@ out_unreg_blkdev:
 out_put_disk:
         while (dr--) {
                 del_timer_sync(&motor_off_timer[dr]);
-                if (disks[dr]->queue)
+                if (disks[dr]->queue) {
                         blk_cleanup_queue(disks[dr]->queue);
+                        /*
+                         * put_disk() is not paired with add_disk() and
+                         * will put queue reference one extra time. fix it.
+                         */
+                        disks[dr]->queue = NULL;
+                }
                 put_disk(disks[dr]);
         }
         return err;
@@ -4579,6 +4585,15 @@ static void __exit floppy_module_exit(void)
                         platform_device_unregister(&floppy_device[drive]);
                 }
                 blk_cleanup_queue(disks[drive]->queue);
+
+                /*
+                 * These disks have not called add_disk().  Don't put down
+                 * queue reference in put_disk().
+                 */
+                if (!(allowed_drive_mask & (1 << drive)) ||
+                    fdc_state[FDC(drive)].version == FDC_NONE)
+                        disks[drive]->queue = NULL;
+
                 put_disk(disks[drive]);
         }
 
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index f00257782fcc..cd504353b278 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -356,14 +356,14 @@ lo_direct_splice_actor(struct pipe_inode_info *pipe, struct splice_desc *sd)
         return __splice_from_pipe(pipe, sd, lo_splice_actor);
 }
 
-static int
+static ssize_t
 do_lo_receive(struct loop_device *lo,
               struct bio_vec *bvec, int bsize, loff_t pos)
 {
         struct lo_read_data cookie;
         struct splice_desc sd;
         struct file *file;
-        long retval;
+        ssize_t retval;
 
         cookie.lo = lo;
         cookie.page = bvec->bv_page;
@@ -379,26 +379,28 @@ do_lo_receive(struct loop_device *lo,
         file = lo->lo_backing_file;
         retval = splice_direct_to_actor(file, &sd, lo_direct_splice_actor);
 
-        if (retval < 0)
-                return retval;
-        if (retval != bvec->bv_len)
-                return -EIO;
-        return 0;
+        return retval;
 }
 
 static int
 lo_receive(struct loop_device *lo, struct bio *bio, int bsize, loff_t pos)
 {
         struct bio_vec *bvec;
-        int i, ret = 0;
+        ssize_t s;
+        int i;
 
         bio_for_each_segment(bvec, bio, i) {
-                ret = do_lo_receive(lo, bvec, bsize, pos);
-                if (ret < 0)
+                s = do_lo_receive(lo, bvec, bsize, pos);
+                if (s < 0)
+                        return s;
+
+                if (s != bvec->bv_len) {
+                        zero_fill_bio(bio);
                         break;
+                }
                 pos += bvec->bv_len;
         }
-        return ret;
+        return 0;
 }
 
 static int do_bio_filebacked(struct loop_device *lo, struct bio *bio)
diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c
index b74eab70c3d0..8eb81c96608f 100644
--- a/drivers/block/mtip32xx/mtip32xx.c
+++ b/drivers/block/mtip32xx/mtip32xx.c
@@ -2068,8 +2068,6 @@ static int mtip_hw_ioctl(struct driver_data *dd, unsigned int cmd,
  *           when the read completes.
  * @data     Callback data passed to the callback function
  *           when the read completes.
- * @barrier  If non-zero, this command must be completed before
- *           issuing any other commands.
  * @dir      Direction (read or write)
  *
  * return value
@@ -2077,7 +2075,7 @@ static int mtip_hw_ioctl(struct driver_data *dd, unsigned int cmd,
  */
 static void mtip_hw_submit_io(struct driver_data *dd, sector_t start,
                               int nsect, int nents, int tag, void *callback,
-                              void *data, int barrier, int dir)
+                              void *data, int dir)
 {
         struct host_to_dev_fis  *fis;
         struct mtip_port *port = dd->port;
@@ -2108,8 +2106,6 @@ static void mtip_hw_submit_io(struct driver_data *dd, sector_t start,
         *((unsigned int *) &fis->lba_low) = (start & 0xFFFFFF);
         *((unsigned int *) &fis->lba_low_ex) = ((start >> 24) & 0xFFFFFF);
         fis->device      = 1 << 6;
-        if (barrier)
-                fis->device |= FUA_BIT;
         fis->features    = nsect & 0xFF;
         fis->features_ex = (nsect >> 8) & 0xFF;
         fis->sect_count  = ((tag << 3) | (tag >> 5));
@@ -3087,7 +3083,6 @@ static void mtip_make_request(struct request_queue *queue, struct bio *bio)
                                 tag,
                                 bio_endio,
                                 bio,
-                                bio->bi_rw & REQ_FUA,
                                 bio_data_dir(bio));
         } else
                 bio_io_error(bio);
@@ -3187,6 +3182,10 @@ skip_create_disk:
         blk_queue_max_segments(dd->queue, MTIP_MAX_SG);
         blk_queue_physical_block_size(dd->queue, 4096);
         blk_queue_io_min(dd->queue, 4096);
+        /*
+         * write back cache is not supported in the device. FUA depends on
+         * write back cache support, hence setting flush support to zero.
+         */
         blk_queue_flush(dd->queue, 0);
 
         /* Set the capacity of the device in 512 byte sectors. */
diff --git a/drivers/block/mtip32xx/mtip32xx.h b/drivers/block/mtip32xx/mtip32xx.h
index 723d7c4946dc..e0554a8f2233 100644
--- a/drivers/block/mtip32xx/mtip32xx.h
+++ b/drivers/block/mtip32xx/mtip32xx.h
@@ -104,9 +104,6 @@
 /* BAR number used to access the HBA registers. */
 #define MTIP_ABAR               5
 
-/* Forced Unit Access Bit */
-#define FUA_BIT                 0x80
-
 #ifdef DEBUG
  #define dbg_printk(format, arg...)     \
         printk(pr_fmt(format), ##arg);
@@ -415,8 +412,6 @@ struct driver_data {
 
         atomic_t resumeflag; /* Atomic variable to track suspend/resume */
 
-        atomic_t eh_active; /* Flag for error handling tracking */
-
         struct task_struct *mtip_svc_handler; /* task_struct of svc thd */
 };
 
diff --git a/drivers/block/nvme.c b/drivers/block/nvme.c
index c1dc4d86c221..1f3c1a7d132a 100644
--- a/drivers/block/nvme.c
+++ b/drivers/block/nvme.c
@@ -41,6 +41,8 @@
 #include <linux/types.h>
 #include <linux/version.h>
 
+#include <asm-generic/io-64-nonatomic-lo-hi.h>
+
 #define NVME_Q_DEPTH 1024
 #define SQ_SIZE(depth)          (depth * sizeof(struct nvme_command))
 #define CQ_SIZE(depth)          (depth * sizeof(struct nvme_completion))
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 3fd31dec8c9c..a6278e7e61a0 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -380,6 +380,7 @@ static int rbd_get_client(struct rbd_device *rbd_dev, const char *mon_addr,
         rbdc = __rbd_client_find(opt);
         if (rbdc) {
                 ceph_destroy_options(opt);
+                kfree(rbd_opts);
 
                 /* using an existing client */
                 kref_get(&rbdc->kref);
@@ -406,15 +407,15 @@ done_err:
 
 /*
  * Destroy ceph client
+ *
+ * Caller must hold node_lock.
  */
 static void rbd_client_release(struct kref *kref)
 {
         struct rbd_client *rbdc = container_of(kref, struct rbd_client, kref);
 
         dout("rbd_release_client %p\n", rbdc);
-        spin_lock(&node_lock);
         list_del(&rbdc->node);
-        spin_unlock(&node_lock);
 
         ceph_destroy_client(rbdc->client);
         kfree(rbdc->rbd_opts);
@@ -427,7 +428,9 @@ static void rbd_client_release(struct kref *kref)
  */
 static void rbd_put_client(struct rbd_device *rbd_dev)
 {
+        spin_lock(&node_lock);
         kref_put(&rbd_dev->rbd_client->kref, rbd_client_release);
+        spin_unlock(&node_lock);
         rbd_dev->rbd_client = NULL;
         rbd_dev->client = NULL;
 }
diff --git a/drivers/block/sx8.c b/drivers/block/sx8.c
index e7472f567c9d..3fb6ab4c8b4e 100644
--- a/drivers/block/sx8.c
+++ b/drivers/block/sx8.c
@@ -1120,7 +1120,7 @@ static inline void carm_handle_resp(struct carm_host *host,
                         break;
                 case MISC_GET_FW_VER: {
                         struct carm_fw_ver *ver = (struct carm_fw_ver *)
-                                mem + sizeof(struct carm_msg_get_fw_ver);
+                                (mem + sizeof(struct carm_msg_get_fw_ver));
                         if (!error) {
                                 host->fw_ver = le32_to_cpu(ver->version);
                                 host->flags |= (ver->features & FL_FW_VER_MASK);