Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c92e699 authored by Jens Axboe's avatar Jens Axboe Committed by Jens Axboe
Browse files

Fixup rq_for_each_segment() indentation 



Remove one level of nesting where appropriate.

Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent bc1c56fd

drivers/block/nbd.c

+20 −23
Original line number Diff line number Diff line
@@ -216,13 +216,11 @@ static int nbd_send_req(struct nbd_device *lo, struct request *req) 
			if (!rq_iter_last(req, iter))

				flags = MSG_MORE;

			dprintk(DBG_TX, "%s: request %p: sending %d bytes data\n",

						lo->disk->disk_name, req,

						bvec->bv_len);

					lo->disk->disk_name, req, bvec->bv_len);

			result = sock_send_bvec(sock, bvec, flags);

			if (result <= 0) {

				printk(KERN_ERR "%s: Send data failed (result %d)\n",

							lo->disk->disk_name,

							result);

						lo->disk->disk_name, result);

				goto error_out;

			}

		}
@@ -326,8 +324,7 @@ static struct request *nbd_read_stat(struct nbd_device *lo) 
			result = sock_recv_bvec(sock, bvec);

			if (result <= 0) {

				printk(KERN_ERR "%s: Receive data failed (result %d)\n",

							lo->disk->disk_name,

							result);

						lo->disk->disk_name, result);

				req->errors++;

				return req;

			}

drivers/block/ps3disk.c

+9 −10
Original line number Diff line number Diff line
@@ -114,7 +114,6 @@ static void ps3disk_scatter_gather(struct ps3_storage_device *dev, 
		offset += size;

		flush_kernel_dcache_page(bvec->bv_page);

		bvec_kunmap_irq(bvec, &flags);



		i++;

	}

}

drivers/block/xen-blkfront.c

+12 −13
Original line number Diff line number Diff line
@@ -186,8 +186,7 @@ static int blkif_queue_request(struct request *req) 


	ring_req->nr_segments = 0;

	rq_for_each_segment(bvec, req, iter) {

			BUG_ON(ring_req->nr_segments

			       == BLKIF_MAX_SEGMENTS_PER_REQUEST);

		BUG_ON(ring_req->nr_segments == BLKIF_MAX_SEGMENTS_PER_REQUEST);

		buffer_mfn = pfn_to_mfn(page_to_pfn(bvec->bv_page));

		fsect = bvec->bv_offset >> 9;

		lsect = fsect + (bvec->bv_len >> 9) - 1;

drivers/s390/block/dasd_eckd.c

+6 −7
Original line number Diff line number Diff line
@@ -1211,8 +1211,7 @@ dasd_eckd_build_cp(struct dasd_device * device, struct request *req) 
			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))

		if (idal_is_needed (page_address(bv->bv_page), bv->bv_len))

			cidaw += bv->bv_len >> (device->s2b_shift + 9);

#endif

	}

drivers/s390/block/dasd_fba.c

+6 −7
Original line number Diff line number Diff line
@@ -262,8 +262,7 @@ dasd_fba_build_cp(struct dasd_device * device, struct request *req) 
			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))

		if (idal_is_needed (page_address(bv->bv_page), bv->bv_len))

			cidaw += bv->bv_len / blksize;

#endif

	}