Re: [PATCH 11/15] libnvdimm: pmem, blk, and btt make_request cleanups

Dan Williams
2015-06-21T13:26:32Z

On Sun, Jun 21, 2015 at 3:10 AM, Christoph Hellwig <hch@lst.de> wrote:
> One patch per driver please.
>
>> diff --git a/drivers/nvdimm/blk.c b/drivers/nvdimm/blk.c
>> index 8a6345797a71..9d609ef95266 100644
>> --- a/drivers/nvdimm/blk.c
>> +++ b/drivers/nvdimm/blk.c
>> @@ -170,18 +170,12 @@ static void nd_blk_make_request(struct request_queue *q, struct bio *bio)
>> struct bvec_iter iter;
>> struct bio_vec bvec;
>> int err = 0, rw;
>> - sector_t sector;
>>
>> - sector = bio->bi_iter.bi_sector;
>> - if (bio_end_sector(bio) > get_capacity(disk)) {
>> + if (unlikely(bio_end_sector(bio) > get_capacity(disk))) {
>> err = -EIO;
>> goto out;
>> }
>>
>> - BUG_ON(bio->bi_rw & REQ_DISCARD);
>
> If you remove the DISCARD check you can kill the max sectors one
> as well, given that generic_make_request_checks() takes care of it.

Ah, true, will add that with the split.