diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2015-05-16 19:28:51 +0300 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2015-06-26 18:23:38 +0300 |
| commit | edc870e54696beb9f3835ecb41a4e1c84ee4584d (patch) | |
| tree | 0ee102885363e2ad30eb6f07900b5b8798f5e4ce | |
| parent | 43d3fa3a0491168ad769d20d5cbae45492509d43 (diff) | |
| download | linux-edc870e54696beb9f3835ecb41a4e1c84ee4584d.tar.xz | |
pmem: make_request cleanups
Various cleanups:
1/ Kill the BUG_ON since we've already told the block layer we don't
support DISCARD on all these drivers.
2/ Kill the 'rw' variable, no need to cache it.
3/ Kill the local 'sector' variable. bio_for_each_segment() is already
advancing the iterator's sector number by the bio_vec length.
4/ Kill the check for accessing past the end of device
generic_make_request_checks() already does that.
Suggested-by: Christoph Hellwig <hch@lst.de>
[hch: kill access past end of the device check]
Reviewed-by: Vishal Verma <vishal.l.verma@linux.intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
| -rw-r--r-- | drivers/nvdimm/pmem.c | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c index d29a42adb95a..e846a627ebdf 100644 --- a/drivers/nvdimm/pmem.c +++ b/drivers/nvdimm/pmem.c @@ -58,31 +58,15 @@ static void pmem_do_bvec(struct pmem_device *pmem, struct page *page, static void pmem_make_request(struct request_queue *q, struct bio *bio) { - struct block_device *bdev = bio->bi_bdev; - struct pmem_device *pmem = bdev->bd_disk->private_data; - int rw; struct bio_vec bvec; - sector_t sector; struct bvec_iter iter; - int err = 0; - - if (bio_end_sector(bio) > get_capacity(bdev->bd_disk)) { - err = -EIO; - goto out; - } - - BUG_ON(bio->bi_rw & REQ_DISCARD); + struct block_device *bdev = bio->bi_bdev; + struct pmem_device *pmem = bdev->bd_disk->private_data; - rw = bio_data_dir(bio); - sector = bio->bi_iter.bi_sector; - bio_for_each_segment(bvec, bio, iter) { + bio_for_each_segment(bvec, bio, iter) pmem_do_bvec(pmem, bvec.bv_page, bvec.bv_len, bvec.bv_offset, - rw, sector); - sector += bvec.bv_len >> 9; - } - -out: - bio_endio(bio, err); + bio_data_dir(bio), iter.bi_sector); + bio_endio(bio, 0); } static int pmem_rw_page(struct block_device *bdev, sector_t sector, |