Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[sfrench/cifs-2.6.git] / drivers / scsi / sd_zbc.c

diff --git a/drivers/scsi/sd_zbc.c b/drivers/scsi/sd_zbc.c
index ff1ba996d87b03f692eaa62a46112c1a3ce4a6ff..a14fef11776ec846c482178ee555c8122a598d22 100644 (file)
--- a/drivers/scsi/sd_zbc.c
+++ b/drivers/scsi/sd_zbc.c
@@ -299,16 +299,6 @@ void sd_zbc_complete(struct scsi_cmnd *cmd, unsigned int good_bytes,
        case REQ_OP_WRITE:
        case REQ_OP_WRITE_ZEROES:
        case REQ_OP_WRITE_SAME:
-
-               if (result &&
-                   sshdr->sense_key == ILLEGAL_REQUEST &&
-                   sshdr->asc == 0x21)
-                       /*
-                        * INVALID ADDRESS FOR WRITE error: It is unlikely that
-                        * retrying write requests failed with any kind of
-                        * alignement error will result in success. So don't.
-                        */
-                       cmd->allowed = 0;
                break;
 
        case REQ_OP_ZONE_REPORT:
@@ -504,7 +494,7 @@ out_free:
 static inline unsigned long *
 sd_zbc_alloc_zone_bitmap(u32 nr_zones, int numa_node)
 {
-       return kzalloc_node(BITS_TO_LONGS(nr_zones) * sizeof(unsigned long),
+       return kcalloc_node(BITS_TO_LONGS(nr_zones), sizeof(unsigned long),
                            GFP_KERNEL, numa_node);
 }