Fixup rq_for_each_segment() indentation

Remove one level of nesting where appropriate.

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

5 files changed, 46 insertions, 50 deletions

diff --git a/drivers/s390/block/dasd_diag.c b/drivers/s390/block/dasd_diag.c
index 6bb9676f203e..571320ab9e1a 100644
--- a/drivers/s390/block/dasd_diag.c
+++ b/drivers/s390/block/dasd_diag.c
@@ -493,10 +493,10 @@ dasd_diag_build_cp(struct dasd_device * device, struct request *req)
         /* Check struct bio and count the number of blocks for the request. */
         count = 0;
         rq_for_each_segment(bv, req, iter) {
-                        if (bv->bv_len & (blksize - 1))
-                                /* Fba can only do full blocks. */
-                                return ERR_PTR(-EINVAL);
-                        count += bv->bv_len >> (device->s2b_shift + 9);
+                if (bv->bv_len & (blksize - 1))
+                        /* Fba can only do full blocks. */
+                        return ERR_PTR(-EINVAL);
+                count += bv->bv_len >> (device->s2b_shift + 9);
         }
         /* Paranoia. */
         if (count != last_rec - first_rec + 1)
@@ -514,16 +514,16 @@ dasd_diag_build_cp(struct dasd_device * device, struct request *req)
         dbio = dreq->bio;
         recid = first_rec;
         rq_for_each_segment(bv, req, iter) {
-                        dst = page_address(bv->bv_page) + bv->bv_offset;
-                        for (off = 0; off < bv->bv_len; off += blksize) {
-                                memset(dbio, 0, sizeof (struct dasd_diag_bio));
-                                dbio->type = rw_cmd;
-                                dbio->block_number = recid + 1;
-                                dbio->buffer = dst;
-                                dbio++;
-                                dst += blksize;
-                                recid++;
-                        }
+                dst = page_address(bv->bv_page) + bv->bv_offset;
+                for (off = 0; off < bv->bv_len; off += blksize) {
+                        memset(dbio, 0, sizeof (struct dasd_diag_bio));
+                        dbio->type = rw_cmd;
+                        dbio->block_number = recid + 1;
+                        dbio->buffer = dst;
+                        dbio++;
+                        dst += blksize;
+                        recid++;
+                }
         }
         cqr->retries = DIAG_MAX_RETRIES;
         cqr->buildclk = get_clock();
diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c
index 36ba45849874..44adf8496bda 100644
--- a/drivers/s390/block/dasd_eckd.c
+++ b/drivers/s390/block/dasd_eckd.c
@@ -1206,14 +1206,13 @@ dasd_eckd_build_cp(struct dasd_device * device, struct request *req)
         count = 0;
         cidaw = 0;
         rq_for_each_segment(bv, req, iter) {
-                        if (bv->bv_len & (blksize - 1))
-                                /* Eckd can only do full blocks. */
-                                return ERR_PTR(-EINVAL);
-                        count += bv->bv_len >> (device->s2b_shift + 9);
+                if (bv->bv_len & (blksize - 1))
+                        /* Eckd can only do full blocks. */
+                        return ERR_PTR(-EINVAL);
+                count += bv->bv_len >> (device->s2b_shift + 9);
 #if defined(CONFIG_64BIT)
-                        if (idal_is_needed (page_address(bv->bv_page),
-                                            bv->bv_len))
-                                cidaw += bv->bv_len >> (device->s2b_shift + 9);
+                if (idal_is_needed (page_address(bv->bv_page), bv->bv_len))
+                        cidaw += bv->bv_len >> (device->s2b_shift + 9);
 #endif
         }
         /* Paranoia. */
diff --git a/drivers/s390/block/dasd_fba.c b/drivers/s390/block/dasd_fba.c
index 119b8d2d5f17..1d95822e0b8e 100644
--- a/drivers/s390/block/dasd_fba.c
+++ b/drivers/s390/block/dasd_fba.c
@@ -257,14 +257,13 @@ dasd_fba_build_cp(struct dasd_device * device, struct request *req)
         count = 0;
         cidaw = 0;
         rq_for_each_segment(bv, req, iter) {
-                        if (bv->bv_len & (blksize - 1))
-                                /* Fba can only do full blocks. */
-                                return ERR_PTR(-EINVAL);
-                        count += bv->bv_len >> (device->s2b_shift + 9);
+                if (bv->bv_len & (blksize - 1))
+                        /* Fba can only do full blocks. */
+                        return ERR_PTR(-EINVAL);
+                count += bv->bv_len >> (device->s2b_shift + 9);
 #if defined(CONFIG_64BIT)
-                        if (idal_is_needed (page_address(bv->bv_page),
-                                            bv->bv_len))
-                                cidaw += bv->bv_len / blksize;
+                if (idal_is_needed (page_address(bv->bv_page), bv->bv_len))
+                        cidaw += bv->bv_len / blksize;
 #endif
         }
         /* Paranoia. */
diff --git a/drivers/s390/char/tape_34xx.c b/drivers/s390/char/tape_34xx.c
index ea3e6a345c89..5b47e9cce75f 100644
--- a/drivers/s390/char/tape_34xx.c
+++ b/drivers/s390/char/tape_34xx.c
@@ -1173,16 +1173,15 @@ tape_34xx_bread(struct tape_device *device, struct request *req)
         ccw = tape_ccw_cc(ccw, NOP, 0, NULL);
 
         rq_for_each_segment(bv, req, iter) {
-                        dst = kmap(bv->bv_page) + bv->bv_offset;
-                        for (off = 0; off < bv->bv_len;
-                             off += TAPEBLOCK_HSEC_SIZE) {
-                                ccw->flags = CCW_FLAG_CC;
-                                ccw->cmd_code = READ_FORWARD;
-                                ccw->count = TAPEBLOCK_HSEC_SIZE;
-                                set_normalized_cda(ccw, (void*) __pa(dst));
-                                ccw++;
-                                dst += TAPEBLOCK_HSEC_SIZE;
-                        }
+                dst = kmap(bv->bv_page) + bv->bv_offset;
+                for (off = 0; off < bv->bv_len; off += TAPEBLOCK_HSEC_SIZE) {
+                        ccw->flags = CCW_FLAG_CC;
+                        ccw->cmd_code = READ_FORWARD;
+                        ccw->count = TAPEBLOCK_HSEC_SIZE;
+                        set_normalized_cda(ccw, (void*) __pa(dst));
+                        ccw++;
+                        dst += TAPEBLOCK_HSEC_SIZE;
+                }
         }
 
         ccw = tape_ccw_end(ccw, NOP, 0, NULL);
diff --git a/drivers/s390/char/tape_3590.c b/drivers/s390/char/tape_3590.c
index b16ad7a7631d..9f244c591eeb 100644
--- a/drivers/s390/char/tape_3590.c
+++ b/drivers/s390/char/tape_3590.c
@@ -652,18 +652,17 @@ tape_3590_bread(struct tape_device *device, struct request *req)
         ccw = tape_ccw_cc(ccw, NOP, 0, NULL);
 
         rq_for_each_segment(bv, req, iter) {
-                        dst = page_address(bv->bv_page) + bv->bv_offset;
-                        for (off = 0; off < bv->bv_len;
-                             off += TAPEBLOCK_HSEC_SIZE) {
-                                ccw->flags = CCW_FLAG_CC;
-                                ccw->cmd_code = READ_FORWARD;
-                                ccw->count = TAPEBLOCK_HSEC_SIZE;
-                                set_normalized_cda(ccw, (void *) __pa(dst));
-                                ccw++;
-                                dst += TAPEBLOCK_HSEC_SIZE;
-                        }
-                        if (off > bv->bv_len)
-                                BUG();
+                dst = page_address(bv->bv_page) + bv->bv_offset;
+                for (off = 0; off < bv->bv_len; off += TAPEBLOCK_HSEC_SIZE) {
+                        ccw->flags = CCW_FLAG_CC;
+                        ccw->cmd_code = READ_FORWARD;
+                        ccw->count = TAPEBLOCK_HSEC_SIZE;
+                        set_normalized_cda(ccw, (void *) __pa(dst));
+                        ccw++;
+                        dst += TAPEBLOCK_HSEC_SIZE;
+                }
+                if (off > bv->bv_len)
+                        BUG();
         }
         ccw = tape_ccw_end(ccw, NOP, 0, NULL);
         DBF_EVENT(6, "xBREDccwg\n");