Merge tag 'libnvdimm-for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm...

[cascardo/linux.git] / drivers / s390 / block / dcssblk.c

diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c
index 8c027a9..5ed44fe 100644 (file)
--- a/drivers/s390/block/dcssblk.c
+++ b/drivers/s390/block/dcssblk.c
@@ -548,10 +548,10 @@ dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char
         */
        num_of_segments = 0;
        for (i = 0; (i < count && (buf[i] != '\0') && (buf[i] != '\n')); i++) {
-               for (j = i; (buf[j] != ':') &&
+               for (j = i; j < count &&
+                       (buf[j] != ':') &&
                        (buf[j] != '\0') &&
-                       (buf[j] != '\n') &&
-                       j < count; j++) {
+                       (buf[j] != '\n'); j++) {
                        local_buf[j-i] = toupper(buf[j]);
                }
                local_buf[j-i] = '\0';
@@ -723,7 +723,7 @@ dcssblk_remove_store(struct device *dev, struct device_attribute *attr, const ch
        /*
         * parse input
         */
-       for (i = 0; ((*(buf+i)!='\0') && (*(buf+i)!='\n') && i < count); i++) {
+       for (i = 0; (i < count && (*(buf+i)!='\0') && (*(buf+i)!='\n')); i++) {
                local_buf[i] = toupper(buf[i]);
        }
        local_buf[i] = '\0';
@@ -826,6 +826,8 @@ dcssblk_make_request(struct request_queue *q, struct bio *bio)
        unsigned long source_addr;
        unsigned long bytes_done;
 
+       blk_queue_split(q, &bio, q->bio_split);
+
        bytes_done = 0;
        dev_info = bio->bi_bdev->bd_disk->private_data;
        if (dev_info == NULL)
@@ -871,7 +873,7 @@ dcssblk_make_request(struct request_queue *q, struct bio *bio)
                }
                bytes_done += bvec.bv_len;
        }
-       bio_endio(bio, 0);
+       bio_endio(bio);
        return;
 fail:
        bio_io_error(bio);
@@ -906,10 +908,10 @@ dcssblk_check_params(void)
 
        for (i = 0; (i < DCSSBLK_PARM_LEN) && (dcssblk_segments[i] != '\0');
             i++) {
-               for (j = i; (dcssblk_segments[j] != ',')  &&
+               for (j = i; (j < DCSSBLK_PARM_LEN) &&
+                           (dcssblk_segments[j] != ',')  &&
                            (dcssblk_segments[j] != '\0') &&
-                           (dcssblk_segments[j] != '(')  &&
-                           (j < DCSSBLK_PARM_LEN); j++)
+                           (dcssblk_segments[j] != '('); j++)
                {
                        buf[j-i] = dcssblk_segments[j];
                }